tree 071fedd9c023907c9f76ffb4cd28eed726785ca0
parent da45c001c0353e243b43868169c4dfdfe82a6b72
parent 7b5e71072452d517340520c900659aa7b8c21353
author Yorke Lee <yorkelee@google.com> 1410595203 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410595203 +0000

am 7b5e7107: am fb122f3c: Merge "Fix build break" into lmp-ub-dev

* commit '7b5e71072452d517340520c900659aa7b8c21353':
  Fix build break