Commits
Ken Sumrall authored and Android Git Automerger committed fa5a2593c99M
am be473c8f: Merge branch \'jb-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr1-dev-plus-aosp * commit 'be473c8fd12955dcb861f330f5f7a4a2a453c8df':
Showing diff to57f39c23b69