tree 3aaafae78a7283c9a4f717ac6c0e130bb673453e
parent c7fdfe6b67d81a62d79912780b585673043148ab
parent ce393373b73e1a1f30ce9bb41568d415cab7df49
author Deepanshu Gupta <deepanshu@google.com> 1396577252 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396577252 +0000

am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev

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