| commit | cbd4a491a23d3c8de2703c6e6510161ddd148793 | [log] [tgz] |
|---|---|---|
| author | tturney <tturney@google.com> | Wed May 31 09:17:11 2017 -0700 |
| committer | Tom Turney <tturney@google.com> | Wed May 31 16:17:57 2017 +0000 |
| tree | 5484b8cc913411ab7f550935771d3a863a3f63a0 | |
| parent | e1bacebbe3207eaa72ff6f22b3aa87c55ecda832 [diff] | |
| parent | 2865998536ba689e58684c23f5360e5e631beb18 [diff] |
resolve merge conflicts of 28659985 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I3ab3616302a9b27daa50c7170fa1aba663e70898