OSDN Git Service

am 7c6c5920: (-s ours) am e65f51f5: am dd334be9: Camera M permissions: lockscreen...
authorzafir <zafir@google.com>
Thu, 27 Aug 2015 11:19:21 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:21 +0000 (11:19 +0000)
* commit '7c6c5920561d5ed4e85282f2af32b7567fb047d1':


Trivial merge