tree 85c8017324e2357c479e01bef23304dc922aafed
parent e66df909b9e138d8254c1a5bb08fe79bf473aa69
parent e85d798b4a8574c7302644ccd911ccd7dcf53faf
author Deepanshu Gupta <deepanshu@google.com> 1440719449 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440719449 +0000

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

* commit 'e85d798b4a8574c7302644ccd911ccd7dcf53faf':