commit | 6c36cd5c9ecad2338510d0efa1cd674fc4b82445 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon May 03 16:37:03 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 03 16:37:03 2010 -0700 |
tree | 2d1b915fa45e0892f907c14ae0625e15f84b9790 | |
parent | deb7a12ae53ffc6256304c8b614272992c8c7777 [diff] | |
parent | 3b9255e3f5ff68c03e9c0df9d82a74891bede6d7 [diff] |
am 3b9255e3: am e57d8918: merge from open-source master