| commit | d3b1780c45e6a7cf621e7df97203759d08a9c52c | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Tue Apr 07 18:23:36 2015 -0700 |
| committer | Chris Elliott <chriselliott@google.com> | Tue Apr 07 18:23:36 2015 -0700 |
| tree | 778013b7c3f6b38fb1b0974a2fde1d5be5dd6e91 | |
| parent | 3f7ec12b23f9288d15e1392b67c30482f7db3afc [diff] | |
| parent | 47965ddb7b72cb8b96d395b5f87dda7ce3509e0c [diff] |
resolved conflicts for merge of 47965ddb to lmp-mr1-dev-plus-aosp Change-Id: Ibed75bf21cd7aacabec41fc620824141cb865b88