tree 3b227f57ccf6fb7f8179fe2ebed6b615ff82fabd
parent 3c9f0fb35685daa0702ca73aa6cbc2da28126239
parent a507ceecfa8a40f02ef8124d9626c51de69f43ed
author Kevin Jin <kjin@google.com> 1424377661 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424377661 +0000

am a507ceec: am 226cf886: Merge "Fix 2 lint warnings"

* commit 'a507ceecfa8a40f02ef8124d9626c51de69f43ed':
  Fix 2 lint warnings