commit | 8de2cf4cce9ae2e121fccb4732fd23c64aace102 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 31 14:01:45 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 31 14:01:45 2010 -0700 |
tree | 18e1194624515277a01892e65ae79f1389c65fda | |
parent | 93511f384b1180bf5277a26ceeff568fa6aa858d [diff] | |
parent | ef9d148ad63e79b7ea1ecad49163f33a7d37aea1 [diff] |
merge from open-source master Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4