tree 03de23e8de68a227ddfdebce87151b27fcf6e704
parent 2eef4251674ed842cecb794831c1e6dfa3639b8c
parent 87762c7e1f5473b8ff51c2cf30d3d5c47d67642a
author Michael Chan <mchan@android.com> 1295500870 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295500870 -0800

am 87762c7e: am b43ac8fc: Fix build break

* commit '87762c7e1f5473b8ff51c2cf30d3d5c47d67642a':
  Fix build break