OSDN Git Service

am a10df1a8: am dd400d6a: (-s ours) am b7394671: Merge "Work on issue #22303510:...
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 18:11:08 +0000 (18:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:11:08 +0000 (18:11 +0000)
commit6cfac81be9a9f3bdf9b121054dd88e638b434599
treedac0c3e7fb56a41aecac39e4e0713ea791d15008
parent6d9b954b98370b450bc815c6087993da07f5e116
parenta10df1a86806b51a063a76199f1793a641b192e7
am a10df1a8: am dd400d6a: (-s ours) am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev

* commit 'a10df1a86806b51a063a76199f1793a641b192e7':