OSDN Git Service

am 1bd6d9c9: (-s ours) am 94fed352: am 188af044: Merge "Revert "frameworks/base:...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 07:07:08 +0000 (07:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:07:08 +0000 (07:07 +0000)
* commit '1bd6d9c979eddeaa8fb602383fa227db8e741ef9':


Trivial merge