| commit | bb5a79de5a305849137af8248ba3820c470b3ce9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 13 16:24:35 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Aug 13 16:24:35 2014 -0700 |
| tree | 4201f9110cc3a8aa46221c004a839668215d19f9 | |
| parent | 773f90d9fbdcc0cc55e106b98b9d5f4a00058371 [diff] | |
| parent | cdcb08a3c6b72a5dbf186cb97ba5aa8b1d9ccb7c [diff] |
resolved conflicts for merge of cdcb08a3 to lmp-dev-plus-aosp Change-Id: Id8f5c23dadf1fcf00297df1c0e4a6fcb461308b8