OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82064fc 57f605f)
am 57f605f8: am a136f8d7: am c54bcade: Merge "New internal permission to protect...
authorRubin Xu <rubinxu@google.com>
Mon, 22 Jun 2015 16:23:06 +0000 (16:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 22 Jun 2015 16:23:06 +0000 (16:23 +0000)
* commit '57f605f82b6ebf87bd9e7f2def4a082ab06a4556':
  New internal permission to protect apps against rogue Nfc message.

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