Commits
Android (Google) Code Review authored and Android Git Automerger committed b8b117e1e7fM
am a8d5644b: Merge change 7726 into donut Merge commit 'a8d5644b548263d68e2c9bfff58958b29c3525ff' * commit 'a8d5644b548263d68e2c9bfff58958b29c3525ff': Fix issue 1985479 lots of backup NPEs.
Showing diff todef06bcec0e