tree 02dbacf6509ca9c686858c984fc372972b1a601a
parent 254a79c4b5d117dd0e1b050691013ee45c73d451
parent fb122f3cc697f9190e0c08b3ebbbd0136994f348
author Yorke Lee <yorkelee@google.com> 1410594322 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410594322 +0000

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

* commit 'fb122f3cc697f9190e0c08b3ebbbd0136994f348':
  Fix build break