| commit | 30b849b503cce8e6e905ca94fa24f312c6823b37 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Thu Aug 27 11:21:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:21:12 2015 +0000 |
| tree | 8924d31ff2ecb8b544ab35dab62f515aac397156 | |
| parent | f51a45960848ed55f92ded99734acb33588d1918 [diff] | |
| parent | 33fc242ecbb438b5dab70a2c97a06d0816d6ccd9 [diff] |
am 33fc242e: (-s ours) am 5a620488: Merge "Update/add strings for permissions UI changes" into mnc-dev * commit '33fc242ecbb438b5dab70a2c97a06d0816d6ccd9':