| commit | 5b3ca7b12e5645ed69bc27d79509f16a1bebb8dd | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jun 03 12:12:00 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Jun 03 12:12:00 2015 -0700 |
| tree | 9fbd8300ad6378aba54b58b55921f78c5d1a1578 | |
| parent | bd8771077c21d0603afe480b21a7fd6ef935aa55 [diff] | |
| parent | de28adf3942ab8930fc4df1778329df1fc607afc [diff] |
resolved conflicts for merge of de28adf3 to mnc-dev-plus-aosp Change-Id: I69f80ee5cba90b1516a35171a38d40cc79d07c19