commit | 55d791e74eaa8c80b965075d6debc1cfd7bde99a | [log] [tgz] |
---|---|---|
author | Grace Kloba <klobag@google.com> | Mon Jan 18 23:43:27 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 18 23:43:27 2010 -0800 |
tree | bb0c5963796f49a16fb847313c951ca625e102dc | |
parent | 8d4baa789302b2c0f2657af9ba6dc98fcc926ee2 [diff] | |
parent | 5a0bf1f03e5f62449ea2520edb79ea868e6f06e7 [diff] |
am 5a0bf1f0: DO NOT MERGE Merge commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7' into eclair-plus-aosp * commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7': DO NOT MERGE