| commit | 6a6ad9b6d39e2512b1d57a1aebd4fc79fceb2394 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:16:47 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:16:47 2010 -0800 |
| tree | 7e5c906576fd87d2330d755e2cbc1b165048a16d | |
| parent | a5dccc2d524c2d2c9a5e3e3cf4ea6b4e605e3559 [diff] | |
| parent | ea0f3e9deb05f2a77a616428db0d65d4579d013d [diff] |
am ea0f3e9d: am a7f85762: reconcile main tree with open-source eclair Merge commit 'ea0f3e9deb05f2a77a616428db0d65d4579d013d' * commit 'ea0f3e9deb05f2a77a616428db0d65d4579d013d': Add uses-feature to the manifest. android-2.1_r1 snapshot