commit | 6ce8b0ad27d6668435e9167f8b95e1a11f014419 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue May 04 09:31:11 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 04 09:31:11 2010 -0700 |
tree | f82434ee97cea0cbf9028f08dad559b86a382ba1 | |
parent | b4f6b2114c7829ff23bb874a40191f5e42da608b [diff] | |
parent | 4929e5a58c2723cbb37df21d2765f0b5a2610f38 [diff] |
am 4929e5a5: am e4b9834f: am 6de3a6fd: merge from open-source master