commit | ed275e2b202a7ffbf1f1e5227c3a09b5d8849b82 | [log] [tgz] |
---|---|---|
author | Greg Hartman <ghartman@google.com> | Thu May 04 19:59:23 2017 -0700 |
committer | Greg Hartman <ghartman@google.com> | Thu May 04 19:59:23 2017 -0700 |
tree | 535d3f1c5f2755161be53bc4cc764c83cdca6c22 | |
parent | 8fac8c43522c6c9a62f666d10d36c8b9342fd621 [diff] | |
parent | 4bb8be0df5aec0bf7b8717571c15ad7ea8f7cb59 [diff] |
Moving forward to OPP2.170420.012 git reset --hard da33024086a12e43563271e6f4b65e9bb1717ac1 git merge -s ours goog/oc-gce-dev BUG: 38009324 Change-Id: I7512747e316263f15291bff94b70ad4a9ed21385