| commit | 832267afca9f3cf7ed1682e6a33fbd96f4879d12 | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Tue May 30 16:19:36 2017 -0700 |
| committer | Todd Kennedy <toddke@google.com> | Tue May 30 16:19:36 2017 -0700 |
| tree | a01ab19a96fb21b9b9028f21913b428e9e5f8a85 | |
| parent | 27daeba300231c7e23da540f44cb92397e1167ba [diff] | |
| parent | fc5c78e0ef79d28ee9f0c543be6187ba13f70901 [diff] |
resolve merge conflicts of fc5c78e0ef79 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ic9e83a568e992ea1444bb321ca9dda2f7002e4aa