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