tree c6efd4099d63806180b2310de5c9ea81c2f1e26e
parent 495ce4e8463305ab18a8f10a09b874ba8f71d608
parent 871c2158289409a3afdf7dd399cca3cc05a5243c
author Colin Cross <ccross@android.com> 1539337977 -0700
committer android-build-merger <android-build-merger@google.com> 1539337977 -0700

Merge "Make the protobuf directory match closer to upstream" am: 548c124a59
am: 871c215828

Change-Id: I11c548bdfea36a0e052f641096cede4be860bbce