tree a12481a58b9ab94d244e3a7277546fca5ec6aa41
parent 99939cce702b6b5a01be351f1a0b406a16509103
parent ef9f3043f5259fa55376a1522152779295e15da6
author Deepanshu Gupta <deepanshu@google.com> 1396576905 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396576905 +0000

am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev

* commit 'ef9f3043f5259fa55376a1522152779295e15da6':
  Fix layoutlib [DO NOT MERGE]