tree 084249ab6a8c158b225a63eb53ce583a19445316
parent 86f3be750a91c31e52b85451e247b9c177e4f29e
parent 5f6c901ad062cd7d88db09b555e28ee354ca66c6
author Yorke Lee <yorkelee@google.com> 1437786114 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1437786114 +0000

Merge "Protect against lack of WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev