tree bfe6ac43d0c03140a26294c5a4d9c0ed0e5cbc81
parent af602602dd0e9d218b7910ce010d2e87daa4bbd1
parent e34c5ec986d632f376db692ff624b342a2774102
author Aurimas Liutikas <aurimas@google.com> 1499984968 +0000
committer android-build-merger <android-build-merger@google.com> 1499984968 +0000

Merge "Fix an assortment of lint bugs." into oc-support-26.1-dev
am: e34c5ec986

Change-Id: I0b21797bcf4796adad276afd4f8f6c6461612339