| commit | 0d0da9b40469b847f9913dd97805b7bd99b1aeb9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 10 18:59:31 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Jul 10 18:59:31 2015 -0700 |
| tree | 6325fea09b22b60f6c139c853b7e301d547dbc43 | |
| parent | cda7cf7f6fda88525b6827cebf6372473b3fc876 [diff] | |
| parent | 6052c89f4d200c3d9ac16cf077e321b64c0b8ba7 [diff] |
resolved conflicts for merge of 6052c89f to mnc-dr-dev-plus-aosp Change-Id: If44e52b1dad6e5210931452fb160e64c7becbfc7