diff options
author | Sebastien Hertz <shertz@google.com> | 2015-08-21 10:10:18 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 10:10:18 +0000 |
commit | b1d01411f4daafd5a07619d7c2060f99db61a64b (patch) | |
tree | cda2f592f9e12607a489dcfb0f6ee16013d16762 | |
parent | b893c1ba4957b608a84b64aee14e6c42380ed3c0 (diff) | |
parent | 5d2faf111e18fc44163ec4fe3cc8c6151d3e6aeb (diff) | |
download | frameworks_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