tree cba62d0d64153aa2169651696bc238591341d679
parent 450025202f16977d2df3a5f41f709745127fc734
parent ddf080cf1e53dec3a149efed3ca22cc999175800
author Adam Cohen <adamcohen@google.com> 1414085409 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085409 +0000

am ddf080cf: am f10b0f92: am 3e232794: am 76bf5553: Merge "A bit of code cleanup (issue 11026590)" into jb-ub-now-jetsonic

* commit 'ddf080cf1e53dec3a149efed3ca22cc999175800':