| commit | b6b3d7255fc1483ada960c4b340caddfe5d062a8 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Nov 07 11:01:36 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Tue Nov 07 11:01:36 2017 -0800 |
| tree | 7e12bdc7f87bac9c50a6aaf14eefe0f1358f1e4c | |
| parent | 6d74e457121abc3b29dbeb5031cf707b5888b92e [diff] | |
| parent | eb0fde522eec59391f8e5a0e2ac6a276b9bccd52 [diff] |
resolve merge conflicts of eb0fde5 to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: If8acf1a07c69f8b7b05d6e3aa1dc37722e1df6ea