| commit | 2e345351b339e7196b198adc14e3fbb73722e298 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Oct 04 10:03:08 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Sat Oct 04 10:03:08 2014 -0700 |
| tree | e020a7a75b3375c62300296aa49ae9fc94bf454c | |
| parent | b4954dc3849357f9e54c3a435c4455271fd631b0 [diff] | |
| parent | a508714800242b294291060641ed35d719bdc857 [diff] |
resolved conflicts for merge of a5087148 to lmp-dev-plus-aosp Change-Id: Ic6b352650a7dec53cdd681d0f0b8ba4278e560d3