OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1ae064d
c5151d2
)
am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev
author
Sebastien Hertz
<shertz@google.com>
Fri, 21 Aug 2015 10:03:48 +0000
(10:03 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 21 Aug 2015 10:03:48 +0000
(10:03 +0000)
* commit '
c5151d2c378e4dad4d1312caf2021d7515297d06
':
Allow debugging only for apps forked from zygote
Trivial merge