| commit | 33d48abe37ca532779561a6f7aeef2120e00d663 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Nov 01 13:01:13 2017 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Wed Nov 01 13:01:13 2017 +0000 |
| tree | 1a515ba57736738eebe9c519d81eebe1f2caffd3 | |
| parent | a349943547b352a1f012ed993c6eebb4d5582246 [diff] | |
| parent | a0f796f20f496649a400f7d4bc398d091458bd67 [diff] |
resolve merge conflicts of a0f796f20 to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I514907d92d4b0e83350f0b49147d70d6693f9db6