tree ee625470cd7e8564160bf369750c9fbf75168866
parent e54852d9f453abcb7ef6e563ba8a7d1de1666a0f
parent 58bcd5a8a32b519f2c311470304cff9aa7188d3e
author Sunny Goyal <sunnygoyal@google.com> 1478737597 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1478737597 +0000

Merge "Fixing build breakage due to proto compiler change" into ub-launcher3-master