tree 915a1df70197f122c5fcfce34097dd39490ed401
parent c6ef5428cf3ced10645f5bab7bc3b99ba5ec191a
parent 6acadebe8b7a3e498900c9eeceef7e0395768690
author Deepanshu Gupta <deepanshu@google.com> 1396578390 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396578390 +0000

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

* commit '6acadebe8b7a3e498900c9eeceef7e0395768690':
  Fix layoutlib [DO NOT MERGE]