tree f3449b5b4b1e8fb0e69e31a292075477be6ea99c
parent 563f1113158d47bf74fdf568edfc998ab9691c3b
parent d514081abf76c6d8bd17d785a29316ecf01c6e9f
author Wonsik Kim <wonsik@google.com> 1442711781 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442711781 +0000

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 'd514081abf76c6d8bd17d785a29316ecf01c6e9f':
  DO NOT MERGE fix build