tree ff5bf30242ff444d41cfeb257d4914bb38905b2e
parent f6c9a6a2d77b99233999138209a3b26622c062dc
parent d4670102fe30f13c95168273558d28fad2503c2d
author Xavier Ducrohet <xav@google.com> 1440711464 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440711464 +0000

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':