OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bd2563 23444e7)
am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMI...
authorAmit Mahajan <amitmahajan@google.com>
Tue, 30 Jun 2015 18:21:50 +0000 (18:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Jun 2015 18:21:50 +0000 (18:21 +0000)
* commit '23444e76d2480d2537c2b6418f0c6c89c8cdb590':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help