| commit | 46e9879adc4b18b34349c7a18e6994549f94586c | [log] [tgz] |
|---|---|---|
| author | sachiyo <sachiyo@google.com> | Fri Jan 26 16:00:55 2018 -0800 |
| committer | sachiyo <sachiyo@google.com> | Fri Jan 26 16:00:55 2018 -0800 |
| tree | d3e9f86e525864a7c543618510e20f0abb4670d0 | |
| parent | 5f60238c666333bed0b00c578cc219038f0da773 [diff] | |
| parent | b7b7cee2f18f4b0e604dfa9cb4684912693f26ae [diff] |
resolve merge conflicts of b7b7cee2f18f4b0e604dfa9cb4684912693f26ae to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I68bf4aa2388d3d0d29883748df0403be856acfb8