tree 33a3377a4caf520682687734541ee48206631db4
parent 77c911a64cee5bf960b1126747f2016e2a150e36
parent 84cad11e5d8c3000472e8bb22dc698cf9b3c8612
author Tamas Berghammer <tberghammer@google.com> 1484776954 +0000
committer android-build-merger <android-build-merger@google.com> 1484776954 +0000

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am: e69f086d72
am: 84cad11e5d  -s ours

Change-Id: I11fc4ec250cad41599c9a96256eb639f11a6bfe9