| commit | 5972e52e15e075e40dfcdc3ffaed1b7c4e2afac1 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Thu Sep 30 18:43:41 2010 -0400 |
| committer | Mike Lockwood <lockwood@android.com> | Thu Sep 30 18:43:52 2010 -0400 |
| tree | 98dc34e6408e8f535e23f3766037372fa9247929 | |
| parent | 07b88ea0acd44ecd317ce37eb4338e5b0d2b52b0 [diff] | |
| parent | 53b070275568af0d1016e019fdf0aa1ed28665f1 [diff] |
resolved conflicts for merge of 53b07027 to master Change-Id: Ia5ce86d84454a4be76e71aeb77942ba8d88d2700