| commit | 5d2faf111e18fc44163ec4fe3cc8c6151d3e6aeb | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Fri Aug 21 10:03:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 10:03:51 2015 +0000 |
| tree | 3d2540bdc5d19db00dd683c94f81eb15d5feb12e | |
| parent | 99b252adc78a0450b7a881aff93a77f6d0e160ce [diff] | |
| parent | c5151d2c378e4dad4d1312caf2021d7515297d06 [diff] |
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