| commit | d4b954f4aaf0ce4d34698833c069fcdb999126ad | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Thu Aug 27 11:21:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:21:26 2015 +0000 |
| tree | 8924d31ff2ecb8b544ab35dab62f515aac397156 | |
| parent | f4b272c33ff58fc0f6507f75f19c3bfd906f7dce [diff] | |
| parent | caee73d36590e7a38507bf346a11d9cf91940870 [diff] |
am caee73d3: (-s ours) am 3f468007: Merge "Protect against lack of WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev * commit 'caee73d36590e7a38507bf346a11d9cf91940870':