Commits
The Android Open Source Project authored and Android Git Automerger committed a668cc4e48fM
am 50ce2526: (-s ours) am 9dcfff20: am ca4117ca: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '50ce25264492452ef2c2acd3ded3ae52e0b421e4':
Showing diff toc5b7edf7abc