tree cba62d0d64153aa2169651696bc238591341d679
parent 2b7de18804b3ff5bc954a3bf7e33a3ced96b29fd
parent a5250ad3e4429c357471d19defa1ad6e424225f9
author Adam Cohen <adamcohen@google.com> 1414085483 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085483 +0000

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

* commit 'a5250ad3e4429c357471d19defa1ad6e424225f9':