tree 62622212c7b5a94cbe8f64c0ab8251a65de4a102
parent 6aebb777c645535247b68e4ec291636073076174
parent 3dba141e23c05c9b4ab3e48e66221324d06f00c7
author Winson Chung <winsonc@google.com> 1393445003 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393445003 +0000

am 3dba141e: am 3de6ea86: Merge "Updating Read/Write settings permission protectionLevels. (Bug 11372484)" into ub-now-lunchbox

* commit '3dba141e23c05c9b4ab3e48e66221324d06f00c7':
  Updating Read/Write settings permission protectionLevels. (Bug 11372484)