tree e496da34a28d47cfca3893dba89b20c81f782362
parent bd762373964eb3cb71bdd79cbf82c27faa22699d
parent 23de8dc2625d4aeb4dc9085c5865ed571f96261a
author Deepanshu Gupta <deepanshu@google.com> 1391655830 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391655830 +0000

am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev

* commit '23de8dc2625d4aeb4dc9085c5865ed571f96261a':
  Optimize layout rendering in layoutlib