tree 45813bbed9f6a298cd71c4725d2f10c05948e776
parent 94c757831486f559b2fa1f53a9d27fc461f7e1f3
parent 1973b350bad5d14804c101ea9d31c213bc4bdfa8
author Dake Gu <dake@google.com> 1490223449 +0000
committer android-build-merger <android-build-merger@google.com> 1490223449 +0000

Merge "Leanback: fix regression caused by fixing error prone" into nyc-support-25.4-dev
am: 1973b350ba

Change-Id: Ic2d18bc55b895a1f1445beaec32b424661cc3731