| commit | 2cb7db116f738b9c88f3aeceb345cbdc99de04ce | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Thu Aug 02 17:15:43 2012 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Thu Aug 02 17:15:43 2012 -0700 |
| tree | 45e751e352da4ab82842b43569233b8b1f099c5a | |
| parent | e1c47324fc22f86f378cb6ccc51e4554eec5156b [diff] | |
| parent | 41508f0544c5905def4a7e9ccb07941e5f7417fd [diff] |
resolved conflicts for merge of 41508f05 to jb-dev-plus-aosp Change-Id: I7232528f0f438ce9cf7759643631a250f545306e