OSDN Git Service

am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 01:44:02 +0000 (01:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 01:44:02 +0000 (01:44 +0000)
commit5e570d37dfc136b60b2ad185a2c9660d2166540b
tree77a543c1c965aa588648ee586f0b53df06fde40f
parent44063c65f688c831d43a807f6e3ff3687d1f62e8
parentc1b987f0b574b25ecea115562122faf5c74b142e
am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

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