tree 3cdf6d3984135d3cbcdc425fece5acfda1829cf3
parent 979f413d2437fd4c9a28767343ec7c2aadf8dbf1
parent d3443070e3595a8d00144bfe9e14a5d4d07c9506
author Evan Charlton <evanc@google.com> 1410858150 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410858150 +0000

am d3443070: am eba6a7fd: am 07229c50: Merge "Use the BROADCAST_STICKY permission" into lmp-dev

* commit 'd3443070e3595a8d00144bfe9e14a5d4d07c9506':
  Use the BROADCAST_STICKY permission