Commit 501c710e authored Dec 16, 2014 by Tim Murray Committed by Android Git Automerger Dec 16, 2014

Merge branch 'lmp-mr1-dev-plus-aosp' of...

Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp

There are no changes