tree 10da860fcff71886af91d082e31f0e1917926848
parent c0c642ad641fd056525c8acbf034dd593c699cfd
parent 88a6301eb3062ee2183b9bcdfd3939fefb832fc1
author Sunny Goyal <sunnygoyal@google.com> 1422666524 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666524 +0000

am 88a6301e: am a20490cd: Merge "Disabling debug logs" into ub-now-porkchop

* commit '88a6301eb3062ee2183b9bcdfd3939fefb832fc1':