| commit | 88fd901986e5d972e7594405cf84e216b2221863 | [log] [tgz] |
|---|---|---|
| author | Jeff Gaston <jeffrygaston@google.com> | Fri Sep 15 13:32:34 2017 -0700 |
| committer | Jeff Gaston <jeffrygaston@google.com> | Fri Sep 15 13:33:43 2017 -0700 |
| tree | d22f073cee668d5cf4bd4b059e3dcd791b0918df | |
| parent | 7745b9e50475b39baf637dd193bfc7443f319805 [diff] | |
| parent | 593caca87d7f4e375215611d18046366a41f58ed [diff] |
resolve merge conflicts of 593caca87d to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I095b88fde5965f8e3eb8d4fe92df768c3333733f