Merge commit '9d12fdb1b55500d69df5a1bdc2fcba57a2f1876c' into eclair-plus-aosp * commit '9d12fdb1b55500d69df5a1bdc2fcba57a2f1876c': Fix http://b/2139600 (expander indicators misaligned).
Merge commit '9d12fdb1b55500d69df5a1bdc2fcba57a2f1876c' into eclair-plus-aosp * commit '9d12fdb1b55500d69df5a1bdc2fcba57a2f1876c': Fix http://b/2139600 (expander indicators misaligned).