tree b33d613df66bf6eb693c7a84aeb1a2ccc889a4dc
parent f01e70d21414a14ff0d85565560289f207744e01
parent dde8b8694954c0268eb12a7ccbddf07d9de262fd
author Nicolas Geoffray <ngeoffray@google.com> 1448272410 +0000
committer android-build-merger <android-build-merger@google.com> 1448272410 +0000

Merge "Fix lint error."
am: dde8b86949

* commit 'dde8b8694954c0268eb12a7ccbddf07d9de262fd':
  Fix lint error.