| commit | b28ff487fb6db4a44e4d18aa17d8253f00a63bb6 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Nov 12 13:24:42 2014 -0800 |
| committer | Dan Albert <danalbert@google.com> | Wed Nov 12 13:24:42 2014 -0800 |
| tree | 3e86f055fb0dd069bc41ba7c1270780fa34e9aaf | |
| parent | 56dd295b69a78017baf44491cb27fcaaf8101f1c [diff] | |
| parent | 5e6cf24213c5eacc9d3e3c8da5826be4a23f22af [diff] |
resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9