tree 32f3e2b8a8985b62b4953d19dadde49db3b43c9e
parent 74e4f9ebe8383987bb6877a764c0cbdc0664fdf7
parent 4a89348ee1c5e7c9fcf52709b8ef153b6dbc17e2
author Chiao Cheng <chiaocheng@google.com> 1379118156 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379118156 -0700

am 4a89348e: am a7d8c348: Merge "Fix build break." into klp-dev

* commit '4a89348ee1c5e7c9fcf52709b8ef153b6dbc17e2':
  Fix build break.