tree b4ebaef7d244fea19973aae7d7595eb6ad1f8920
parent c2e98ca39a67bd24e305826c51a0ba85f7b59ef4
parent ebdedb47e5a24f980e7820c65c60c5bc04c5895d
author Deepanshu Gupta <deepanshu@google.com> 1440639183 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440639183 +0000

am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

* commit 'ebdedb47e5a24f980e7820c65c60c5bc04c5895d':
  LayoutLib: Update golden test images. [DO NOT MERGE]