tree fd2af7a97a0bb5a16e2a91d4b8c558f13b2e089a
parent 492090a55e2fa94745aaf4e0e295845d8bb1351a
parent 38f2b1ea4146a52f167d1a73e705590266848336
author Deepanshu Gupta <deepanshu@google.com> 1397677468 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397677468 +0000

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

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