| commit | cc496dbcd709230c35016e3d84ad06d1e44de9b8 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu Oct 09 13:24:06 2014 -0700 |
| committer | Paul Lawrence <paullawrence@google.com> | Thu Oct 09 13:24:06 2014 -0700 |
| tree | 6011bf2ed3c90eb57f4cc0c9fb783d95f9a1fd74 | |
| parent | 3e64bf45e65641c0dd946de6eefa552718f14c1c [diff] | |
| parent | ae413a71cb7201a08d7e9a8b051b8d2ea61207ed [diff] |
resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aosp Change-Id: Icdc9306b460c116441aad21bfcf3ab549224a141