tree 10da860fcff71886af91d082e31f0e1917926848
parent d338fd6743c5d2e6b67f869d7d0fbcc122f54736
parent 6cf79920bc84a08a1fcc1177feb7e80b0d3a48f6
author Adam Cohen <adamcohen@google.com> 1414566311 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566311 +0000

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

* commit '6cf79920bc84a08a1fcc1177feb7e80b0d3a48f6':