diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-12-02 05:34:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-02 05:34:39 -0800 |
| commit | f12a5c9b12aaa5a45cd8c4b7f77a6eefdf4a85d8 (patch) | |
| tree | 08a6e31330ec08cc9712a49d0706386985432259 /media/java | |
| parent | c7763acabb530950f9af0f487d4834d2ee26ec69 (diff) | |
| parent | ad7ab8be4774a4fbb01a50deed52e819549327a7 (diff) | |
| download | frameworks_base-f12a5c9b12aaa5a45cd8c4b7f77a6eefdf4a85d8.zip frameworks_base-f12a5c9b12aaa5a45cd8c4b7f77a6eefdf4a85d8.tar.gz frameworks_base-f12a5c9b12aaa5a45cd8c4b7f77a6eefdf4a85d8.tar.bz2 | |
am ad7ab8be: am db08d5cd: (-s ours) DO NOT MERGE.
Merge commit 'ad7ab8be4774a4fbb01a50deed52e819549327a7' into eclair-mr2-plus-aosp
* commit 'ad7ab8be4774a4fbb01a50deed52e819549327a7':
DO NOT MERGE.
Diffstat (limited to 'media/java')
0 files changed, 0 insertions, 0 deletions