commit | 28bd98999b3b7ec436e1784bd954ebae29188231 | [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 | cf5f11d7697fff9a0794bfbe690bda207a9c5f63 [diff] | |
parent | 645026c742e9e8806ad140a46c3dc067a2f7a912 [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