OSDN Git Service

am 0b4e41b8: am 76ff0acd: (-s ours) am d69a82c1: Merge "Allow array of required permi...
authorFyodor Kupolov <fkupolov@google.com>
Thu, 27 Aug 2015 17:03:35 +0000 (17:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 17:03:35 +0000 (17:03 +0000)
* commit '0b4e41b814870383b42971e41d690e9287c9d16c':


Trivial merge