OSDN Git Service

am 4076659d: (-s ours) am 2506ff92: am ac0e2425: Fixes to M permissions.
authorzafir <zafir@google.com>
Thu, 27 Aug 2015 11:19:22 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:22 +0000 (11:19 +0000)
* commit '4076659db134a449450d773c6d41b9be2be1ea44':


Trivial merge