tree d0bacc74bb164038cab257897865fcc8eaaa0cd5
parent fff3f7cc824ea92fd14e8e528baf06d1af620749
parent 78d47240fb71a55897c1ef2e2d06492acbe29ad6
author Zhihai Xu <zhihaixu@google.com> 1379117717 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379117717 -0700

am 78d47240: Merge "Fixed review comments" into klp-dev

* commit '78d47240fb71a55897c1ef2e2d06492acbe29ad6':
  Fixed review comments