| commit | f2fbd1b774e19df515b1287b10e1755e8196f054 | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Fri May 19 10:20:31 2017 -0700 |
| committer | Andre Eisenbach <eisenbach@google.com> | Fri May 19 10:20:31 2017 -0700 |
| tree | 5fe492ad597d3360c96ad78ec95899f4d780d5e9 | |
| parent | 78f2de0dee3204fef83a710d01cfde608cf5d197 [diff] | |
| parent | 0533d66ae0a334789c197cde425d3ad87a84dd7d [diff] |
resolve merge conflicts of 0533d66ae to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia8b2e2d67fe7dce4b1cb78622352284ea3a8ebec