| commit | e4d0b1ab4d9f4a63d1096b43326566da850b49c0 | [log] [tgz] |
|---|---|---|
| author | Dimitry Ivanov <dimitry@google.com> | Thu May 25 09:55:51 2017 -0700 |
| committer | Dimitry Ivanov <dimitry@google.com> | Thu May 25 09:57:15 2017 -0700 |
| tree | c85190f5bb1e1c691d03416d2acbfebc210eb462 | |
| parent | 1fa75e153f459a4a49070000ef750003544c93ad [diff] | |
| parent | 57d0f922b61462cbb1caad1b63f75c12637c9741 [diff] |
resolve merge conflicts of bb958f0f5 to oc-dev-plus-aosp Test: n/a Change-Id: Iede624aa5210794d48b63d6053293028483b89c7