tree 10da860fcff71886af91d082e31f0e1917926848
parent 720fd571258ba0a5e9e33540943954c6739d90ac
parent 0fbc9d6c5a733766205f6fb33aedd41c9bbb4b0a
author Adam Cohen <adamcohen@google.com> 1414566362 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566362 +0000

am 0fbc9d6c: am a5250ad3: am 422a7208: am 4b0badc9: am 3a14eeb5: Bit of code cleanup (issue 11648206)

* commit '0fbc9d6c5a733766205f6fb33aedd41c9bbb4b0a':