OSDN Git Service

Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler...
authorTamas Berghammer <tberghammer@google.com>
Wed, 18 Jan 2017 22:38:09 +0000 (22:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jan 2017 22:38:09 +0000 (22:38 +0000)
am: d331d57dc6  -s ours

Change-Id: Ie697d5efaea39e1522e947ac1a8f38f1443a1964


Trivial merge