| commit | 14e161e9c056c74619e88458becbc5883628b657 | [log] [tgz] |
|---|---|---|
| author | sachiyo <sachiyo@google.com> | Thu Feb 15 14:34:03 2018 -0800 |
| committer | sachiyo <sachiyo@google.com> | Thu Feb 15 14:34:03 2018 -0800 |
| tree | 4b869ab5a3f9bab702ac4e52708d33e58555316a | |
| parent | 5c1ecc5670f4f6e2a2ffa38ab7db90a743ba8eb9 [diff] | |
| parent | e7278fe2c0fc37b428b14dcbd4b37ef05eb69678 [diff] |
resolve merge conflicts of e7278fe2c0fc37b428b14dcbd4b37ef05eb69678 to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I2b54c7d9f68e6a57fa002bbbea78bde979ee2122