OSDN Git Service

am 22d4a8b2: (-s ours) am 279678e1: Merge "Show a default icon for permissions that...
authorJulia Reynolds <juliacr@google.com>
Thu, 27 Aug 2015 06:50:27 +0000 (06:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 06:50:27 +0000 (06:50 +0000)
* commit '22d4a8b2ddc15ebb8acfd21ea84b98097d1f8c09':


Trivial merge