Commits
The Android Open Source Project authored and Android Git Automerger committed 096298d8aefM
am a82220fe: (-s ours) Reconcile with jb-release - do not merge * commit 'a82220fef779cff41fc628e63bbd03dc02c4a6a0': Fix a logging NPE problem
Showing diff to4e4306ab14f