| commit | 01c9114f06081a5214b8561f42282125a65da319 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Wed Jun 28 14:22:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 28 14:22:34 2017 +0000 |
| tree | 9ec2672c15bd3e15d9ccfffcc239d03d1fd614e3 | |
| parent | 14b4bd0b6307f66b937cf8cf12d3875f01999a00 [diff] | |
| parent | d3c3eafad3c2375a5ce6ff87bf94a44e4ef2b628 [diff] |
resolve merge conflicts of 645026c74 to oc-dr1-dev-plus-aosp am: 28bd98999b -s ours Change-Id: I2bd24bc6ed8d3f6a55fd7aff99d83d745ea258a7