tree 0a5b6fdba44f8fc75759fa1dbaabff2a7654551a
parent 0e2049cd3905aac54496d14355117f8325e37357
parent 289f1ffb33d9ab7ed1a7c11bcc70c017b3a1c710
author Deepanshu Gupta <deepanshu@google.com> 1397674035 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397674035 +0000

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

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