| commit | 9eb066973fdf6c48ccd3fbb80e37bc21ba7bf20b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Nov 07 09:41:22 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Tue Nov 07 09:41:22 2017 -0800 |
| tree | b5a2ccf2826879c6a7d19e13e609068f1285ca96 | |
| parent | dac909414c2ee8a450541ccd84ee8ba05bb48516 [diff] | |
| parent | 01270df0c14ce3b25db0970f28b8d35e47b2f82c [diff] |
resolve merge conflicts of 01270df to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I6159f192fefbb301889e700a3cb2e75bb6fc90ec