tree 9910a9ddc2afe936b74b42ea0e51190b9a0e5002
parent 94381db0dd29bcb7d6bf1f266644c7032b2bffcb
parent c39730583e83c734633f6bd534c509cf46b7a4e5
author Svetoslav Ganov <svetoslavganov@google.com> 1438723137 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438723137 +0000

am c3973058: am b381d697: am 073bfb9b: am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev

* commit 'c39730583e83c734633f6bd534c509cf46b7a4e5':
  Ensure per package and per UID state share same package settings.