commit | e73e4911f38d62fcbe98e01981c8d6e17143b502 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 28 13:06:48 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 28 13:06:48 2010 -0700 |
tree | 81b9d40ded5a097de959f065812635631456f939 | |
parent | d2e340cded6cab67f058cb6021b0ef31e9021778 [diff] | |
parent | 51ecd212b6339fe817d50af5aab9dfe244613b35 [diff] |
am 51ecd212: merge from open-source master