| commit | d3c3eafad3c2375a5ce6ff87bf94a44e4ef2b628 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Wed Jun 28 22:45:51 2017 +0900 |
| committer | Jiyong Park <jiyong@google.com> | Wed Jun 28 22:52:25 2017 +0900 |
| tree | 0710772c9f7a7213a8aa41de215708328b086511 | |
| parent | 96f1bb1c2967b5d2c3bed54c22bd19e320d8aaf3 [diff] | |
| parent | 77956aea592c077d5671f26ce754f2c9eba780be [diff] |
resolve merge conflicts of 645026c74 to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Merged-In: If8fc73e4ae4c2f8281c41a12f1c18079aab8baa2 Change-Id: Iadfcd7e75044d62f2015dc62c69ee68869b40cd7