tree ce1a1c6a3271e4764c8c83cf70f5c8521c2e4fe3
parent b6e37662ba0762d3ce4a10c271f154d36fb6fb43
parent 64af14a4d2231adf5dcc2336b0f672c2f52c97a5
author Chih-Hung Hsieh <chh@google.com> 1474925125 +0000
committer android-build-merger <android-build-merger@google.com> 1474925125 +0000

Merge "Fix Google pylint warnings." am: bcd229277a
am: 64af14a4d2

Change-Id: I332da66829738d6793ca1795103f903271f235c6