DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am: 5a638a6ad1
am: 6031fba9f2 -s ours
Change-Id: I3ef4ce03f26c527793224ae5aadbb065e747f829
This commit is contained in:
5a638a6ad1
am: 6031fba9f2 -s ours
Change-Id: I3ef4ce03f26c527793224ae5aadbb065e747f829