tree f7ed974bc9b75bdf622241a43af02fb4a8ddd344
parent 7ef38ea9e5ee1d2fd58e818f37191a589793e236
parent 61695ffcbccc6cca210e869eb3bc6e97127c2357
author Christopher Tate <ctate@google.com> 1349473561 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349473561 -0700

Merge "Make sure settings writes are permission checked correctly" into jb-mr1-dev