commit | 2ef569417d1136f9dcb8c2bbc6e3c3c59c4ea28d | [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 | d25e56189054be79ff2fa699502a6a806a3c9d1a | |
parent | ee0306b93386340c86d6ca9f70bd147fba16d901 [diff] | |
parent | 83cb93b4016cbd6029a2d215a7b63fa716b103e4 [diff] |
merge from open-source master Change-Id: Ia99df155e4abf0585ed46943b75a2a1569d0534f