tree c1f9031a2b399bac89e969003e330c84927a0b7c
parent 3ed8a3131bfe2b47f1f31e326d1bb8b054295cbe
parent c7c8b069407236bcc04c086912c73002d48419ef
author John Reck <jreck@google.com> 1414480623 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414480623 +0000

am c7c8b069: Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad automerge: 49a01fc

* commit 'c7c8b069407236bcc04c086912c73002d48419ef':
  Cleanup debug options