tree 75d47cdcbb7eadf0f96aa8203158ca157cc4a260
parent 0a65d84933655095b0cf587a847dbcf8674f1a1c
parent c264c38e1935c5b13224853422c543b79bf805bb
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.