tree b381c21242087bf96b0b0f52f3f6c731e3b7e689
parent e37c761e5e850aebb3be56a2eadaa85cc2134547
parent 8c1cd7e61f050afd450cb05add633e2fbe0b195a
author Sander Alewijnse <salewijnse@google.com> 1415399751 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415399751 +0000

am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev

* commit '8c1cd7e61f050afd450cb05add633e2fbe0b195a':
  Added the restrictions pending application restrictions key.