tree 7dfe5722589eef8ea4ff3a51cef4b362ec0ed545
parent fbe5b757cff040a455f93388d6eebdee0653a089
parent 2554cb916a1764218a1f11cc9741203b468310d0
author Elliott Hughes <enh@google.com> 1334854652 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1334854652 -0700

Merge "Only wait for gdb to attach if debug_db_uid is in the environment." into ics-mr1-plus-art