| commit | a27856d443ce65271aa16ea22a7b413e9dd9c664 | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Wed Jun 07 17:47:38 2017 -0700 |
| committer | Ian Pedowitz <ijpedowitz@google.com> | Wed Jun 07 19:52:10 2017 -0700 |
| tree | 4afeb975ed16358471b680f56e07896b814fa5d6 | |
| parent | dacd9ed19679fc2c6614620c7b97e9244797d25c [diff] | |
| parent | 695f21a66189c851435c9dc41b4bee57a44aead5 [diff] |
resolve merge conflicts of 695f21a66189 to oc-dr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7