| commit | dbff0d6f9315587a92894936769f5be727b08dd2 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 25 11:24:45 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Aug 25 11:24:45 2015 -0700 |
| tree | 75896f3e7d5dd3f62c6ff739224e6140cd572c4c | |
| parent | 2808bc2faaa1fd42d64bf1b5176d4284bbcefa86 [diff] | |
| parent | d00ca7d3b73bd5a2b67342714cfc75fff38c3dce [diff] |
resolved conflicts for merge of 068ee4d0 to mnc-dev-plus-aosp Change-Id: If276934797138d13fe8c56711615b477e05ee484