| commit | bffa875d78e9ed203aec3e308fcb4cf86582f3f9 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Tue Jun 27 09:59:06 2017 +0900 |
| committer | Jiyong Park <jiyong@google.com> | Tue Jun 27 10:48:28 2017 +0900 |
| tree | 8bc1ea2fc24ddeb234c126f2a5fc78b216c9c9a5 | |
| parent | 3806ea87d63ec7a93d431a4b4e391bbadbefb4ca [diff] | |
| parent | 40da4609e49a90ce84e9152fc23bd6721891836e [diff] |
resolve merge conflicts of 40da4609e to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I0c4a9e0648674b78391e257f6a94bd1e325e1964