| commit | b1d01411f4daafd5a07619d7c2060f99db61a64b | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Fri Aug 21 10:10:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 10:10:18 2015 +0000 |
| tree | cda2f592f9e12607a489dcfb0f6ee16013d16762 | |
| parent | b893c1ba4957b608a84b64aee14e6c42380ed3c0 [diff] | |
| parent | 5d2faf111e18fc44163ec4fe3cc8c6151d3e6aeb [diff] |
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