| commit | 3034b9ae9024880af6e58f173afafda2eea104e9 | [log] [tgz] |
|---|---|---|
| author | Bowgo Tsai <bowgotsai@google.com> | Fri Aug 18 12:22:13 2017 +0800 |
| committer | Bowgo Tsai <bowgotsai@google.com> | Fri Aug 18 12:22:13 2017 +0800 |
| tree | fead0c4d344d8601880ede6c07342c14c5c2ab0f | |
| parent | dd7a03229457907d4bd5bb9e9423de6c51e3b328 [diff] | |
| parent | b72655850765747c6bcf45fb6bece68a56d34e71 [diff] |
resolve merge conflicts of b726558507 to oc-mr1-dev-plus-aosp Change-Id: I0e2f94ac6d6fce944e5b421e4c24a8a73ea03651