commit | f2507c6f211aacb290201f223c2524eca5545bad | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 15 11:31:57 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 15 11:31:57 2010 -0700 |
tree | 78971f2c14a5c928a7ef7edfb0148298c99bf162 | |
parent | 77b7b989c16506daee46f747d15f7f9762099b39 [diff] | |
parent | 590e508ccb5a95f72b6cb0b2028ff3e3592a75b7 [diff] |
merge from open-source master Change-Id: Ia99df155e4abf0585ed46943b75a2a1569d0534f