commit | c3ea373c057fb6a3a5e62ef12e447000b4b9cedf | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 02 08:56:19 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 02 08:56:19 2010 -0700 |
tree | a85071eb34a5dbf792ad54f2dcbf62b76e461d12 | |
parent | dadc673a6da3e56f45266d340365b649ab5218e8 [diff] | |
parent | 0fa2fb72dc07cd0ce30910807775af6a229c27f8 [diff] |
am 59c82376: am c8763858: merge from open-source master