OSDN Git Service

am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolve...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:36:21 +0000 (18:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 18:36:21 +0000 (18:36 +0000)
commit7be53b2447d973b09a0a13daa8533084be2350f8
tree22561947d0d13aef1956e26547711de6cce4fa7b
parent3f615bf2f9de920b2c29386e8978b7e5f7613d66
parenta73bc03b2932b6be80976fa012b9bb26783a6fce
am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

* commit 'a73bc03b2932b6be80976fa012b9bb26783a6fce':
  Optimize layout rendering in layoutlib [DO NOT MERGE]