tree eab76adc08a6e4c7200dab116b01abe0b6086405
parent e1ce916e0029d72ddbf7476efd4993c7301ec784
parent 82a74bbe91b7e90ec2fca56650e3d55ebdedeac2
author Xavier Ducrohet <xav@android.com> 1328575735 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328575735 -0800

am 82a74bbe: (-s ours) am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.

* commit '82a74bbe91b7e90ec2fca56650e3d55ebdedeac2':