OSDN Git Service

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform...
authorPaul Mclean <pmclean@google.com>
Thu, 27 Aug 2015 19:37:15 +0000 (19:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:37:15 +0000 (19:37 +0000)
commit8754607eb01ab4429faff67f1023dd9bc766630e
treef7bd5a566d3bbf79ebd49bb0be1f9d171deb588e
parentc4f9cc27abc8f68ccf146f7113dcbc5c3f6c1050
parent26b8aa32b7e6f3a622a4e2c24af44e71a900cf07
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base