| commit | e13b9d3824fa075053098a6cacd0d4acac94a8d1 | [log] [tgz] |
|---|---|---|
| author | Diego Perez <diegoperez@google.com> | Thu Aug 27 22:00:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 22:00:01 2015 +0000 |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | b464ce3ecd0ad5d8f3b2b4b4f6823136dcdfbe5d [diff] | |
| parent | 603faf4944d26d0895d5fe008a4afa73361ccf27 [diff] |
am 603faf49: 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 '603faf4944d26d0895d5fe008a4afa73361ccf27':