commit | 869cc685b171c5c0c1efbad5df693cfaebe0af43 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 16 13:23:40 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 16 13:23:40 2010 -0700 |
tree | b252fd71bac0916438493eab6f59bfef23da336c | |
parent | 544e1f866edcbe55b3d8f65d50bc831dfb818657 [diff] | |
parent | e3f6a6e1d3e52c1d25d55b6556cc1f2c0598b576 [diff] |
merge from open-source master Change-Id: I9365615f5f94484fb5ab28bb076b25fb4721e2bc