summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Hertz <shertz@google.com>2015-08-21 10:03:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-21 10:03:51 +0000
commit5d2faf111e18fc44163ec4fe3cc8c6151d3e6aeb (patch)
tree3d2540bdc5d19db00dd683c94f81eb15d5feb12e
parent99b252adc78a0450b7a881aff93a77f6d0e160ce (diff)
parentc5151d2c378e4dad4d1312caf2021d7515297d06 (diff)
downloadframeworks_base-5d2faf111e18fc44163ec4fe3cc8c6151d3e6aeb.zip
frameworks_base-5d2faf111e18fc44163ec4fe3cc8c6151d3e6aeb.tar.gz
frameworks_base-5d2faf111e18fc44163ec4fe3cc8c6151d3e6aeb.tar.bz2
am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev
* commit 'c5151d2c378e4dad4d1312caf2021d7515297d06': Allow debugging only for apps forked from zygote
0 files changed, 0 insertions, 0 deletions