tree f5765635a85c74a991623c7937801f069751a98d
parent 57853559c31154db9c202d653065c592169c5027
parent f7681f84918c27f6a626681ce37ed2a236c44e82
author Wei-Ta Chen <weita@google.com> 1285961765 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285961765 -0700

am f7681f84: Do not merge.

Merge commit 'f7681f84918c27f6a626681ce37ed2a236c44e82' into gingerbread-plus-aosp

* commit 'f7681f84918c27f6a626681ce37ed2a236c44e82':
  Do not merge.