| commit | 893ace604d374f6aa80ad18642fe266bad0a3940 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Thu May 19 13:34:44 2011 -0400 |
| committer | Mike Lockwood <lockwood@android.com> | Thu May 19 13:34:44 2011 -0400 |
| tree | a682011d320462a7c841ea4260b587dd21a01d57 | |
| parent | 02aad4811a3390d4a5f509cda41dc421a0f24447 [diff] | |
| parent | 069efd877f5b9b9a2a548573f8aaad981e789b44 [diff] |
resolved conflicts for merge of c1730dcf to master Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486