commit | 92677d978d48a6ab482c511f8a1b6ed7b6f285e0 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 12:16:45 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 12:16:45 2010 -0700 |
tree | 013d2ccd26189d4f0babcdd06a4c65556ae84611 | |
parent | 378c304e8af0ca79563f3973355d865eed940a85 [diff] | |
parent | fc7eccf5fd52a581b750f225d8eee5ac92490ab4 [diff] |
am 1b7e3ef4: am 55bef14f: am fb234bbe: merge from open-source master