commit | 7acf0f37266de5b29a8f14d48d7170cef30cdabf | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 07 16:30:52 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 07 16:30:52 2010 -0700 |
tree | 967fd986d91c0901ee13672863f65981a9e5315d | |
parent | 7e7d75eefd23debadb67e894bc152e479bdb714f [diff] | |
parent | 4067dc52e92d9f896408b1b725fe939c5cae0d33 [diff] |
merge from open-source master Change-Id: Ia3b88d1fc8864903dd67478e972758871730a215