tree ad3cf2304e44d77a583ac28ff560bf9310fffd1a
parent 3c10c7f02277585da94e68fb23823a22201899c7
parent c0ab47832c01ecb66d2fa2d0a9ffe560a604a4e4
author Xavier Ducrohet <xav@android.com> 1300215946 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300215946 -0700

am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge.

* commit 'b7b877a45f469336703844a928482e6438442567':
  Merge 9d76581f from honeycomb. do not merge.