OSDN Git Service

am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 20:30:39 +0000 (20:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 20:30:39 +0000 (20:30 +0000)
commit8c19c6a17d8a019086a36988937462acfb6b830f
tree3b40011469d381fb81770104918e067cf41bb89f
parent1281853a17d24756223c8043b53225ffe8c8f03d
parent16f3a6167bdcbd49e47d843fcb43fe9ffd461531
am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev

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