OSDN Git Service

am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev
authorSebastien Hertz <shertz@google.com>
Fri, 21 Aug 2015 09:49:11 +0000 (09:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 09:49:11 +0000 (09:49 +0000)
commitc5151d2c378e4dad4d1312caf2021d7515297d06
treee7a47c1f7e157a18f71ce79b3f9f899dda00dfef
parentddc2536d2b6f277a7828278a066be874e4f9502e
parentb60bc0ece2b2714845eff37c97cb19d41a308122
am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

* commit 'b60bc0ece2b2714845eff37c97cb19d41a308122':
  Allow debugging only for apps forked from zygote