commit | 1cff973b8956c2b42484cfe9bf78c6c77ec5c346 | [log] [tgz] |
---|---|---|
author | Joe LaPenna <jlapenna@google.com> | Fri Sep 25 18:59:31 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 25 18:59:31 2015 +0000 |
tree | 5f32d8b7d23bf6fdbaa6ef461afafb1668657174 | |
parent | 0d3c613ecf69014b2de5254b79c77ca83c0fca04 [diff] | |
parent | 84270fb60ab29e9e0aa7975c9d300a758f0b16ef [diff] |
am 84270fb6: (-s ours) am 5d05db28: (-s ours) am ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev * commit '84270fb60ab29e9e0aa7975c9d300a758f0b16ef': Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE