| commit | 7d0e0fc6801099013af6209c7021a5f1d9d0cff6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 25 11:26:40 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Aug 25 11:26:40 2015 -0700 |
| tree | 93630410c05ffb87c6bcba0f0683d6bbdedd49f5 | |
| parent | 2697c01c5462e343d43592ee34f5e684267dac22 [diff] | |
| parent | d00ca7d3b73bd5a2b67342714cfc75fff38c3dce [diff] |
resolved conflicts for merge of 068ee4d0 to mnc-dr-dev-plus-aosp Change-Id: Ie7b2673e24ce4880c20112d64164cec228ca5755