OSDN Git Service

am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
authorAmit Mahajan <amitmahajan@google.com>
Fri, 26 Jun 2015 22:03:46 +0000 (22:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Jun 2015 22:03:46 +0000 (22:03 +0000)
commit853c61788387c38c1103f26b1c8c028da5676776
treeacd63d7e6b94c3a34298d16ec248aa0e9d3230e0
parent48b38452b0454a1398d01a5df9fe949e2febdeef
parent791dd2c67466d2d9dafe58b1258e7718e3f30bc0
am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

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