Commits
Ian Rogers authored and Android Git Automerger committed 705e604ad85M
am fa1ae7db: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp * commit 'fa1ae7dbb81ea6122170e119c7b81ed0996cf36e':
Showing diff to3643f928824