tree ee4030716ed4ecded3e78aa3c1d8b627f7ff6864
parent 8ac3ed8edd99209695096c2d1cbf4a7b0184b190
parent 76bf5553e083aea1aa91f07d4a9433263501c575
author Adam Cohen <adamcohen@google.com> 1383008136 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383008136 -0700

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

* commit '76bf5553e083aea1aa91f07d4a9433263501c575':
  A bit of code cleanup (issue 11026590)