tree 1ce19922396c657ebbc4d4da545cfa976999429d
parent e0d3e66d811ac689ebf655887298afe1e5c7b99f
parent 471061ce3dc4133549263bde3bd5e661b69f17fc
author Deepanshu Gupta <deepanshu@google.com> 1400005565 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400005565 +0000

am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

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