| commit | ac8abec905b56672e13e4723ca96036f686d1825 | [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 | a22e004f57f87da1df0b1d953786f4256f9ad873 [diff] | |
| parent | bb958f0f507aa0254276566a2c1141f9aae0c0b1 [diff] |
resolve merge conflicts of bb958f0f5 to oc-dev-plus-aosp Test: n/a Change-Id: Iede624aa5210794d48b63d6053293028483b89c7