diff options
| author | Jens Ole Lauridsen <jlauridsen@google.com> | 2015-08-27 21:56:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 21:56:42 +0000 |
| commit | 628f7d1d713179b8167767ca3d83db655670cb62 (patch) | |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | fad2175eac3458a28a96aa2b98d7501b09809205 (diff) | |
| parent | 69e6c7d26ae02ed4636deda6ef2e983b0b6be50c (diff) | |
| download | idea-628f7d1d713179b8167767ca3d83db655670cb62.tar.gz | |
am 69e6c7d2: am 7ce7fa02: (-s ours) am 961eee5d: am 84b122e8: Merge "Fix some Nele tests that are failing on Jenkins." into studio-1.4-dev automerge: bc7cbbe automerge: 6710c9e
* commit '69e6c7d26ae02ed4636deda6ef2e983b0b6be50c':
0 files changed, 0 insertions, 0 deletions