tree cbd66b3cfd1304dd38624ea5418a7164dd3bf64b
parent 2cf178e6530b0d83ab1f2e22cf3671ef751be3d4
parent d8d05d5602baae6a79ca6cc933f18dcd8a4dc745
author Michael Jurka <mikejurka@google.com> 1320967361 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320967361 +0000

am d8d05d56: am 287fa408: am 31234d81: fix build

* commit 'd8d05d5602baae6a79ca6cc933f18dcd8a4dc745':
  fix build