Jerry Zhang 7914797d02 Fix build breakage caused by proto conflict
Two proto constants were merged at the same time,
causing a conflict.

Test: none
Change-Id: If429fc28d8f2c37c19945a7cffe1147770ea447d
2018-02-01 00:13:15 +00:00
..