| commit | 6316a9d56430468afd54123271911270dd0838d9 | [log] [tgz] |
|---|---|---|
| author | Jerome Gaillard <jgaillard@google.com> | Tue Jun 25 16:14:33 2019 +0100 |
| committer | Jerome Gaillard <jgaillard@google.com> | Tue Jun 25 16:14:33 2019 +0100 |
| tree | 0966a8d73d12a303a69153c520822eaec8e0ba76 | |
| parent | ef1d09fa7c3140d3e76f0538cc9ac20ef3f55645 [diff] | |
| parent | e57ae0e247ac02900f205e7dc1959fde7fa22c3f [diff] |
resolve merge conflicts of e57ae0e247ac02900f205e7dc1959fde7fa22c3f to master-layoutlib-native Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I180ed00fd7c14c1f184b949ad546fa801dd1e91f