tree b17479249c47abc216a206a5a0f2f5ebd9cd38e5
parent 54d87d9d943326cbcaf9f4b342dd28e85e8a3e74
parent 5e394f2b4e7917bf811bc3ac3dde948422833883
author Wonsik Kim <wonsik@google.com> 1442712802 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442712802 +0000

am 5e394f2b: am d514081a: am c391d887: am 943f1c0c: (-s ours) am 7334b956: am 96c55282: am d8b9218c: am 9d0497bd: am 44da08ed: (-s ours) am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev

* commit '5e394f2b4e7917bf811bc3ac3dde948422833883':
  DO NOT MERGE fix build