tree 669ff5192925d25b8f07156da5603a8b9b975e86
parent ddd0314875d48ec987eaad52a865bdfa2197b3b1
parent 54b54ced24a296b9ecb064bb33d5ebe1e92ae466
author Xiaolei Wang <wxiaolei@google.com> 1435359506 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435359506 +0000

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

* commit '54b54ced24a296b9ecb064bb33d5ebe1e92ae466':
  add action background bar and support two alignment modes