tree 70e6ef5ca52795ed7cf8f138745ff35d6f6521e1
parent b9c886204009908c9c22c0f9c356a95aeea138fb
parent c6714279e5a39ac1f5eabd0431bb46fcfe6240fe
author Xiaolei Wang <wxiaolei@google.com> 1435339774 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435339774 +0000

Merge "add action background bar and support two alignment modes" into lmp-mr1-ub-dev