tree 85b6d39483cbc69d711c98acb1356803b62d5342
parent df0947b60b6dd7ec83c01b892d0265667505e4cb
parent 937223d4a008030e7b04d02daf4ffcc6bf4ff2fd
author Stuart Scott <stuartscott@google.com> 1384221901 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384221901 -0800

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

* commit '937223d4a008030e7b04d02daf4ffcc6bf4ff2fd':
  Fixing build and continuing refactor