OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff8dc21 55f86b1)
am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked...
authorSebastien Hertz <shertz@google.com>
Fri, 21 Aug 2015 10:18:38 +0000 (10:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 10:18:38 +0000 (10:18 +0000)
* commit '55f86b1811f0411a5d685d6c97772b846a706e19':
  Allow debugging only for apps forked from zygote DO NOT MERGE


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