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':
This commit is contained in:
Ian Rogers
2014-11-22 01:23:58 +00:00
committed by Android Git Automerger

Diff Content Not Available