| commit | fb5587efa178fddcb59ba11722692fa876498e2e | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Mon Jan 18 23:43:32 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 18 23:43:32 2010 -0800 |
| tree | 02e006c44a49085c3359169c33b2dcaed4d96203 | |
| parent | b8d4b14257b049e2475631ad1f006f6f5d03fc04 [diff] | |
| parent | 90f5995ffda21e9709f9452fc6bb3aca64ab0318 [diff] |
am 17b14bd3: DO NOT MERGE Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp * commit '17b14bd36aba265ac6bffc2626d8db29713d7c45': DO NOT MERGE