OSDN Git Service

am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 20:27:46 +0000 (20:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 20:27:46 +0000 (20:27 +0000)
commit16f3a6167bdcbd49e47d843fcb43fe9ffd461531
tree5a64720a796605c91a0d609b59fe6e54fa97c8d9
parent2de8509e30555594e9f39c410f458d5ffc8e7917
parentc0e9c66d7d59873443714cc19e5cea8c044931bb
am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev

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