tree 020803d23d451d1e01e7516ee2e3201a307039a2
parent f9ae233be1532f83c59bcb99508ebe75e1b78f00
parent 416f1d9b9a260b3fca95d2a241abe823d50157b3
author Grace Kloba <klobag@google.com> 1267488801 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1267488801 -0800

am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2

Merge commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565' into eclair-mr2-plus-aosp

* commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565':
  DO NOT MERGE