tree ae4e1c14c086e6c5968a35c117f0eb8ce101a377
parent 0bba2cc9db1f55ba8f78c2d6a225401371574cff
parent b7b997e6262fc0090f1deba7aeb62a096a1e6da9
author Andrew Solovay <asolovay@google.com> 1430232626 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430232626 +0000

am b7b997e6: am 0d59144c: am bd719d7b: am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs

* commit 'b7b997e6262fc0090f1deba7aeb62a096a1e6da9':