| commit | b8d4b14257b049e2475631ad1f006f6f5d03fc04 | [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 | 02e006c44a49085c3359169c33b2dcaed4d96203 | |
| parent | 7bd3a10bca972bd97bfd9a66377501169011ffa2 [diff] | |
| parent | 90f5995ffda21e9709f9452fc6bb3aca64ab0318 [diff] |
am 5a0bf1f0: DO NOT MERGE Merge commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7' into eclair-plus-aosp * commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7': DO NOT MERGE