tree be637547c725febd189f8b263693db6557ddaa7d
parent 85a8301a6d63be2efa8b2440ca694c3707b2f536
parent f069ffc287e723d8e89bdadf10adaa36f58791c3
author Siva Velusamy <vsiva@google.com> 1440712780 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440712780 +0000

am f069ffc2: am 7a6f590b: (-s ours) am 3cce74c0: am 1b1595cc: Merge "resolve merge conflicts of f77256e to studio-1.4-dev." into studio-1.4-dev automerge: 7aa8c13 automerge: 073b61f

* commit 'f069ffc287e723d8e89bdadf10adaa36f58791c3':