tree c1f432bb4d7f7c93ca76fe55cbbe3cb7131d10db
parent ff85316d3215168c867e1ac2814f71a00b2f3065
parent 68938b7b469f459589265f20c47ff14b618bba7f
author Tamas Berghammer <tberghammer@google.com> 1484771055 +0000
committer android-build-merger <android-build-merger@google.com> 1484771055 +0000

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am: 68938b7b46

Change-Id: Ic6091d9ddc6f156a196d73f229f60f27f33cca19