| commit | 9ccf4bfbde288119e6e90f9ad58351a5d2c59ff9 | [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 | 9bc8005e079a1062751b5e9d62afeef3f2407dfb [diff] | |
| parent | 068ee4d03fc06edfd171fc03ed427b013288be48 [diff] |
resolved conflicts for merge of 068ee4d0 to mnc-dev-plus-aosp Change-Id: If276934797138d13fe8c56711615b477e05ee484