tree be637547c725febd189f8b263693db6557ddaa7d
parent 7680a4a357ce8c555f2bdd97210be8bc7ccec992
parent 796b4ee2ffcf44aff46f68bd53d114e1cb3353d3
author Diego Perez <diegoperez@google.com> 1440674162 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674162 +0000

am 796b4ee2: (-s ours) am 8d54ca7c: am 566a6095: Merge "Avoid crash in new SDK preview" into studio-1.4-dev automerge: 94cb585 automerge: e1b87b9

* commit '796b4ee2ffcf44aff46f68bd53d114e1cb3353d3':