OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adde39d b1d0141)
am b1d01411: am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge...
authorSebastien Hertz <shertz@google.com>
Fri, 21 Aug 2015 10:15:47 +0000 (10:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 10:15:47 +0000 (10:15 +0000)
* commit 'b1d01411f4daafd5a07619d7c2060f99db61a64b':
  Allow debugging only for apps forked from zygote


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