tree 5b016a717e0fe2f9fe3c4fecf66b403af9408a2e
parent 65faee787b7d6be3bded323d7ab08c94635d20d1
parent b3cf497f8241de2bf74216bc9084d79dc5bd9683
author Yuichi Araki <yaraki@google.com> 1494387896 +0000
committer android-build-merger <android-build-merger@google.com> 1494387896 +0000

Merge "Address lint warnings" into oc-dev
am: b3cf497f82

Change-Id: If482fc52fd7874a592de5e5e9dfbfcc7f762595e