tree d99571e6880423eb6f5a1c43e59f1fc5629e82a4
parent b49d9af7e1205312cc25e23636ef3980bee4c1b0
parent 181963a0200e7c442d66f9f893da41e2b52a4d8c
author Grace Kloba <klobag@google.com> 1263947651 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1263947651 -0800

am 181963a0: (-s ours) am 196926b9: Merge "DO NOT MERGE" into eclair

Merge commit '181963a0200e7c442d66f9f893da41e2b52a4d8c'

* commit '181963a0200e7c442d66f9f893da41e2b52a4d8c':
  DO NOT MERGE