| commit | 43854aa6cbd0cf3d84037b46019975ec8f30760a | [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 | 53ea8efe0cdf57c60f09e325551a8e61991953f6 [diff] | |
| parent | 28bd98999b3b7ec436e1784bd954ebae29188231 [diff] |
resolve merge conflicts of 645026c74 to oc-dr1-dev-plus-aosp am: 28bd98999b -s ours Change-Id: I2bd24bc6ed8d3f6a55fd7aff99d83d745ea258a7