tree 8cddc9ce04ceb54f239efb041a6a3baf4447f737
parent 47238f204822d0f603c0b8853347fa613b49ee7b
parent 7c1e71a9800e470ddc488b444e1c277874822d96
author Winson Chung <winsonc@google.com> 1397595715 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397595715 +0000

am 7c1e71a9: am b2c94b6e: am 48ff1356: am 54dba509: DO NOT MERGE  Updating Read/Write settings permission protectionLevels. (Bug 11372484)

* commit '7c1e71a9800e470ddc488b444e1c277874822d96':
  DO NOT MERGE  Updating Read/Write settings permission protectionLevels. (Bug 11372484)