tree 26f1d1b10fec448c6a46ba2a7dfec7fc46d01bf2
parent bdd0ad79b9b027280bd371c7b6795b04ed89ac8f
parent 90b0b69cd48067b92a90ea248ef91e473b7f1c10
author Deepanshu Gupta <deepanshu@google.com> 1397673818 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397673818 +0000

am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev

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