| commit | 3befd9c07435d3f89e59442deb511e0608d831f8 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed Aug 20 17:56:56 2014 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Wed Aug 20 17:56:56 2014 -0700 |
| tree | f1a4028e4812fad0c73fa57f41ba9b5cbc804818 | |
| parent | cbed4e523b01633414f1a5ccdae180b26df7799e [diff] | |
| parent | 4b48ce8f0cbbaa58f0f2b592af131e9ad9ebb292 [diff] |
resolved conflicts for merge of 4b48ce8f to lmp-dev-plus-aosp Change-Id: I9bb9b6b48bc3c355ad303db89b0cbd1642eaa292