OSDN Git Service

am bf68f8d4: am b3fd5e17: (-s ours) am c3067882: Merge "Added android.permission...
authorFyodor Kupolov <fkupolov@google.com>
Thu, 27 Aug 2015 20:20:05 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:20:05 +0000 (20:20 +0000)
* commit 'bf68f8d4c89e38667c607ecadd1cc36a0b6362ce':


Trivial merge