diff options
| author | Xavier Ducrohet <xav@google.com> | 2015-08-27 21:37:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 21:37:44 +0000 |
| commit | 516264a4ce5dd298ab2e38ade780fc8f01eda7dc (patch) | |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | f6c9a6a2d77b99233999138209a3b26622c062dc (diff) | |
| parent | d4670102fe30f13c95168273558d28fad2503c2d (diff) | |
| download | base-516264a4ce5dd298ab2e38ade780fc8f01eda7dc.tar.gz | |
am d4670102: am c51d5e76: (-s ours) am 6b94d009: am 6b38b2cb: Merge "Add IDE files for jack/jill API projects." into studio-1.4-dev automerge: 5dd7e44 automerge: cfaf5b3
* commit 'd4670102fe30f13c95168273558d28fad2503c2d':
0 files changed, 0 insertions, 0 deletions