tree b4ebaef7d244fea19973aae7d7595eb6ad1f8920
parent af51c69052e4a7e4c8a10358812976bb188f050c
parent 13cd7660813d52f5538a088612c3098d13484b12
author Deepanshu Gupta <deepanshu@google.com> 1440639063 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440639063 +0000

am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

* commit '13cd7660813d52f5538a088612c3098d13484b12':
  Change tools:list_item to listitem. [DO NOT MERGE]