commit | fc97669ad5c11a9b4ec88db9a592a16387092ec9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 14:14:59 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 14:14:59 2010 -0700 |
tree | c1d44d7cacbc3d72a63015b1426ba986085c3b40 | |
parent | 9a069c80fe6195c4e3d813712881b902da25cd5a [diff] | |
parent | 72a6af1ab13fbcb98598b0e11b0bb3b069d30635 [diff] |
am 72a6af1a: am 7d952644: merge from open-source master