OSDN Git Service

am e3e55f2a: am 5d1a182a: Merge "Secure broadcasts." into jb-mr2-dev
authorRobert Greenwalt <rgreenwalt@google.com>
Thu, 18 Apr 2013 18:53:34 +0000 (11:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Apr 2013 18:53:34 +0000 (11:53 -0700)
commit63e7dcf9cf190e1286003b4b3674e94b0d8c2dca
tree0e08344ffb962fbca2a557f3fc48025fb7bca6ec
parent33cf00a07e5ecafe51fe7110b7803386cf29a715
parente3e55f2a1943a296472d91680a385ea5dc288a31
am e3e55f2a: am 5d1a182a: Merge "Secure broadcasts." into jb-mr2-dev

* commit 'e3e55f2a1943a296472d91680a385ea5dc288a31':
  Secure broadcasts.
core/res/AndroidManifest.xml