tree ff5bf30242ff444d41cfeb257d4914bb38905b2e
parent c62cf119def1e4047513117e1c8e8f014f252763
parent 76ae24d8608d0af4978216613ec138980e1edde7
author Chris Warrington <cmw@google.com> 1440711442 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440711442 +0000

am 76ae24d8: am db5eb006: (-s ours) am ac1a5f03: am 674d2490: Merge changes I329c6475,I7b26dd66 into studio-1.4-dev automerge: 573805c automerge: 2527458

* commit '76ae24d8608d0af4978216613ec138980e1edde7':