OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33cf00a e3e55f2)
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)
* commit 'e3e55f2a1943a296472d91680a385ea5dc288a31':
  Secure broadcasts.

1  2 
core/res/AndroidManifest.xml patch | diff1 | diff2 | blob | history

diff --cc core/res/AndroidManifest.xml
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help