commit | f22092a1eb54d7c63af26f4956006097746c2521 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 31 14:23:19 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 31 14:23:19 2010 -0700 |
tree | b62977698da62b843f6c490e6ee3eb0fb0f8e7bf | |
parent | 00b0b25339bc7711079c5c0d8eaf78e7a191c3cf [diff] | |
parent | ad19edbdcd1c86f0eaabbb1685368adc11c3dcb4 [diff] |
am 4790259c: am 8de2cf4c: merge from open-source master