OSDN Git Service

am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related...
authorAmit Mahajan <amitmahajan@google.com>
Fri, 26 Jun 2015 22:18:01 +0000 (22:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Jun 2015 22:18:01 +0000 (22:18 +0000)
commit7278b04383cb6c01c2fbb184c560875ab709dea5
treeda48c9fc2f8a6bb28c97a3d861e1162b69c343a9
parent13c06d6c91e67962b7ffdf92c56e3b01125e4a8d
parent895eb134751ec1495baa30362a514275624e5843
am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

* commit '895eb134751ec1495baa30362a514275624e5843':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
core/res/AndroidManifest.xml