tree 999410d9ca66c4db5dacffed2ee7ae40157e4dd5
parent bfb3afcad96fe38bb0f2e3cf2af2dc993ed663d8
parent a5aedadc0b94bab3277e7bf044250edfa41a71f0
author Doris Liu <tianliu@google.com> 1435701732 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435701732 +0000

am a5aedadc: am 99aa13ec: Merge "Allow null child view when checking whether divider should draw" into mnc-dev

* commit 'a5aedadc0b94bab3277e7bf044250edfa41a71f0':
  Allow null child view when checking whether divider should draw