| commit | 9c59bc9c37dab612c9d8fda98970c317da1963a3 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Nov 09 13:52:18 2017 -0800 |
| committer | Chih-hung Hsieh <chh@google.com> | Fri Nov 10 07:45:58 2017 +0000 |
| tree | 697df673a323e129c53aeb78a271d7a3423a1889 | |
| parent | 6faf7f3111d1bdb26967049075dfff7ab0b70d0d [diff] | |
| parent | 5c4fbd2817a491fcf2c61f34333476dbf875cfca [diff] |
resolve merge conflicts of 5c4fbd2817 to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Exempt-From-Owner-Approval: simple merge conflicts Change-Id: I32cd6ce0eca9b74b20554f20bcf410d76612c47a