tree 80a3b4c13ba476ff76c868ae4d709c3280b7422d
parent e14b24f3a0c39c2e3755b55cca2600e12620ee32
parent eff94bc3647c23c223abe4946595d51d80985eec
author Deepanshu Gupta <deepanshu@google.com> 1400013684 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400013684 +0000

am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev

* commit 'eff94bc3647c23c223abe4946595d51d80985eec':
  Action bar rendering in layoutlib [DO NOT MERGE]