tree b0507a63755050546c50e1f613ec664e89062a44
parent 90713bcfdb0f110116a99bd69d9ade74d76eedf2
parent fb5587efa178fddcb59ba11722692fa876498e2e
author Grace Kloba <klobag@google.com> 1264125449 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1264125449 -0800

am b869c594: (-s ours) am 17b14bd3: DO NOT MERGE

Merge commit 'b869c594465d29e96fb841b48c638ddee232bbd7'

* commit 'b869c594465d29e96fb841b48c638ddee232bbd7':
  DO NOT MERGE