commit | 9aa82e89f2a2014d151ab15256abb41064220940 | [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 | b013fbb9d1d2f493488ba7f3fcebca98f88110c1 | |
parent | dc0d02a1e9ec57d57fc6c7f510f88fbbcb3ded98 [diff] | |
parent | 914b12a965de255f4a496f39f7f9366a408b7c2f [diff] |
am 38a410f1: am 686d9ff5: merge from open-source master