commit | cee6300cf14b56be54a455950e82ce81e7370390 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon May 10 12:54:45 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 10 12:54:45 2010 -0700 |
tree | c9788b232d34c67ad000aea477c6fa84dd7a22f4 | |
parent | 98bb3eeb462c199d88c4d8d33799e832948aa6a0 [diff] | |
parent | 38a410f12a1cbb5f49cdee6323da898b11c907e7 [diff] |
am 38a410f1: am 686d9ff5: merge from open-source master