tree 9c6c6f00d7412786317d8440a77627e80aecb0c5
parent dd749e05c17200542aca1ecd45951d0c98af8ab4
parent ecc42f8bdcd7279c6804bda3b4feeaea51019d48
author Dianne Hackborn <hackbod@google.com> 1339020924 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339020924 -0700

am ecc42f8b: am 4ca17df3: Fix build.

* commit 'ecc42f8bdcd7279c6804bda3b4feeaea51019d48':
  Fix build.