commit | 440de73df965174fdff43ca5c6f4f07de06cdbcd | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 09:51:35 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 09:51:35 2010 -0700 |
tree | a966ce82c20d5ab45b11864f0911b4b0709fcf24 | |
parent | 5e1daa561acfbfc09ab82a6d509ce64ef6f9608f [diff] | |
parent | bb7928ccdae0cc5766f290e18ab14b07d80c6912 [diff] |
am bb7928cc: merge from open-source master