tree 62622212c7b5a94cbe8f64c0ab8251a65de4a102
parent 5865f1a085af60a10eb48070bbdc8f6ff2d972fc
parent 3de6ea8647882c507aaa8578a9fada88eadd0be9
author Winson Chung <winsonc@google.com> 1393444805 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1393444805 -0800

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

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