tree 154c2d824bc1d1f9f092850a92ffab46c4e6cf4b
parent 5edfdac4b8264e3c94673eaede8f17a3568b8496
parent 19bc81dbbaeef90f1417d78a18a96120b8d81762
author Andrew Solovay <asolovay@google.com> 1430152370 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430152370 +0000

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

* commit '19bc81dbbaeef90f1417d78a18a96120b8d81762':