tree 7213ac041b2413fcf0fe2f068a628e30cc866a97
parent d640e062e8a19c02df50ef845d73d576eaaff9db
parent aa5f2ccde2e2ca5fa9594aef204ded4f51f12188
author Chih-hung Hsieh <chh@google.com> 1475036245 +0000
committer android-build-merger <android-build-merger@google.com> 1475036245 +0000

Merge "Fix Google pylint warnings."
am: aa5f2ccde2

Change-Id: Ide1a5bffa1745737142ffde982268addd8c253bb