tree acd3e38539512eb037d74a6af7719b655d80b613
parent ece2fba0eca1ee373f54cc0220f81f155e911979
parent 2dfeccc0c13b2f9f117b23c400b4361ecc48409b
author Sebastien Hertz <shertz@google.com> 1440706274 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440706274 +0000

am 2dfeccc0: (-s ours) am fcb005d1: (-s ours) am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '2dfeccc0c13b2f9f117b23c400b4361ecc48409b':