OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ddc2536 b60bc0e)
am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev
authorSebastien Hertz <shertz@google.com>
Fri, 21 Aug 2015 09:49:11 +0000 (09:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 09:49:11 +0000 (09:49 +0000)
* commit 'b60bc0ece2b2714845eff37c97cb19d41a308122':
  Allow debugging only for apps forked from zygote


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