tree ff5bf30242ff444d41cfeb257d4914bb38905b2e
parent eafe95b5645211b0d9e056e9ebcca7811c36d086
parent d0e6489b5d56efd0b580d15b39658b736116ec13
author Chris Warrington <cmw@google.com> 1440711365 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440711365 +0000

am d0e6489b: am 1a842740: (-s ours) am 6a4fe1df: am a2efe3d6: Merge changes I107ec572,I75d9d3ee into studio-1.4-dev automerge: a6d81db automerge: d197a2d

* commit 'd0e6489b5d56efd0b580d15b39658b736116ec13':