tree 3a953b1c3d1a35e912d3b47222ce04b6d91dcd4d
parent 40afcdd764a6373f95ff10f2875069a9b6ece4b6
parent 6d02eb62f0cf4bbf86d6d4c962776dcb19d9f93b
author Stuart Scott <stuartscott@google.com> 1384231944 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384231944 -0800

am 6d02eb62: am 937223d4: am 582393a1: Merge "Fixing build and continuing refactor" into klp-dev

* commit '6d02eb62f0cf4bbf86d6d4c962776dcb19d9f93b':
  Fixing build and continuing refactor