commit | d1d881aa4096dabbd56c10da59a44a860633123a | [log] [tgz] |
---|---|---|
author | Yorke Lee <yorkelee@google.com> | Thu Aug 27 14:18:44 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:18:44 2015 +0000 |
tree | 84230245b6d0620425180d5fab12ff558de999ab | |
parent | 334469e76f91439fcb0f3b0f9b3089a1d7dd4bdd [diff] | |
parent | d4b954f4aaf0ce4d34698833c069fcdb999126ad [diff] |
am d4b954f4: am caee73d3: (-s ours) am 3f468007: Merge "Protect against lack of WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev * commit 'd4b954f4aaf0ce4d34698833c069fcdb999126ad':