tree 317b1390a400c8496655e6ff053e585512448c01
parent cc4aff9939eb49c3acbc9898cbda030b674c6d3b
parent 9d0497bd4d59cec06f110b159da44fd0c20ad7c5
author Wonsik Kim <wonsik@google.com> 1442051176 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442051176 +0000

am 9d0497bd: am 44da08ed: (-s ours) am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev

* commit '9d0497bd4d59cec06f110b159da44fd0c20ad7c5':
  DO NOT MERGE fix build