Skip to content
Commit 7914797d authored by Jerry Zhang's avatar Jerry Zhang
Browse files

Fix build breakage caused by proto conflict 

Two proto constants were merged at the same time,
causing a conflict.

Test: none
Change-Id: If429fc28d8f2c37c19945a7cffe1147770ea447d
parent 5f2a4ef7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment