OSDN Git Service

am 7b09e2c0: (-s ours) am a7a65ee4: Merge "Allow non system to set perm policy flags...
authorSvetoslav Ganov <svetoslavganov@google.com>
Thu, 27 Aug 2015 09:24:35 +0000 (09:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:24:35 +0000 (09:24 +0000)
* commit '7b09e2c054a8ef3165d130d8ef97b92bcd213764':


Trivial merge