tree 8dd55317d69711c7aad2632948ca041d76007d13
parent 7756aa6aaf75b5562a298b461669e2ee5783a418
parent e69f086d72c69e842c6252b29427c5b15a0853b2
author Tamas Berghammer <tberghammer@google.com> 1484770921 +0000
committer android-build-merger <android-build-merger@google.com> 1484770921 +0000

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

Change-Id: Ia7693c0bf6c730766100bb670a61d9bfda3c1345