| commit | 513c112f912494bc81336149014403e65c9ab1d3 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Wed Oct 01 16:12:34 2014 -0700 |
| committer | Stephen Hines <srhines@google.com> | Wed Oct 01 16:12:34 2014 -0700 |
| tree | f7baabbfb9ba19fb53d01a2a1a8aa79c30a2ed34 | |
| parent | 4981bc731888a803a5c6177c2cdebfd2be4d889f [diff] | |
| parent | 3f2caae206b5d44e83d44b6753ac736171fab9cb [diff] |
resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp Change-Id: I540734e15e984d12b81cc47d90430e40cc3d2397