tree 8fc82cf6f8bcb14f81a6c3a249380e3f38be9720
parent 43ac27281b854d8889523cbc8a488799d2397142
parent e217b6222cc30bc3d6ad58316905a28ce64982d4
author Colin Cross <ccross@android.com> 1541533262 -0800
committer android-build-merger <android-build-merger@google.com> 1541533262 -0800

Merge changes from topic "revert-protobuf3.5.2" am: a4680e1ebe am: 3e312d20cd
am: e217b6222c

Change-Id: Ib4c806582d5445c8387054dbc6fe2f6e173f1a97