tree 7a3e535786994d5c50ef67bd3f0fbfdf19820487
parent 0defe0d5251d1f950acdca8b554747adb42d0970
parent cc245eab2148547f9df37ddc5f767656dc033b81
author Nicolas Geoffray <ngeoffray@google.com> 1443786161 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443786161 +0000

am cc245eab: Merge "Fix lint error."

* commit 'cc245eab2148547f9df37ddc5f767656dc033b81':
  Fix lint error.