tree cfde9b5ebc9da956e956e417caecc444c2512a8c
parent 759febdabcf76ea5908f506e2e5c2ef77854111d
parent 0a7b92762a42be7dd01da87b5f67a405f6f07d31
author Tao Bao <tbao@google.com> 1430760299 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430760299 +0000

am 0a7b9276: am f8f88321: Merge "Turn on text display for debuggable builds"

* commit '0a7b92762a42be7dd01da87b5f67a405f6f07d31':
  Turn on text display for debuggable builds