tree 793364f9b391f1b88ee318c2c97b4e8517d30bcf
parent c58fcad844d59f01dd6f5d9fc1c1803b075f1e10
parent c22a9b7d8eb2e4b2162b0705376303ce9317ae64
author Romain Guy <romainguy@google.com> 1282409063 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282409063 -0700

am 9a5c6e4f: (-s ours) am 18ef3725: DO NOT MERGE. Fix the build.

Merge commit '9a5c6e4f56e574e7591d8d3af1c2b64053df407f'

* commit '9a5c6e4f56e574e7591d8d3af1c2b64053df407f':
  DO NOT MERGE. Fix the build.