tree d250bb22aa5bcc92c6b37a6e6a87423e9cf06390
parent a4c82e7b3a01749ccc36cb746fa5edc39dcadc20
parent 9e0609ee36a76ebd676c73ceea8c424fcbe2eeee
author Chih-hung Hsieh <chh@google.com> 1475036576 +0000
committer android-build-merger <android-build-merger@google.com> 1475036576 +0000

Merge "Fix Google pylint warnings." am: aa5f2ccde2 am: 2d06a27ae6
am: 9e0609ee36

Change-Id: Id5152ca1676935175d7a5c911b128d7e4b312aae