commit | 2d743fe2f39397d41334001d897eb78da56e94ef | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 11:07:49 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 11:08:36 2010 -0700 |
tree | 329c927aa7b709608d488d4271a95aa32df062a1 | |
parent | e896d41699ffe7be932102d7ccc9566f41ddb447 [diff] | |
parent | fb59fbf14e3d8580ad8702343795f03b2f823295 [diff] |
merge from open-source master Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471