commit | d5241d83fe357bb6bdeb61a507ef8e0af2949949 | [log] [tgz] |
---|---|---|
author | Sebastien Hertz <shertz@google.com> | Fri Aug 21 10:03:48 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 10:03:48 2015 +0000 |
tree | 2d69aad363a4f1e2c46f4d80466b91cbfa5b4352 | |
parent | 1ae064d6c2c33ed50a70982952a2034999c018e3 [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