summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Ruiz <alruiz@google.com>2015-08-27 21:59:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:59:03 +0000
commit8d1f0af9d0f1deebcdbdf651905e9371afcd47ac (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parent966e35a7f344b1157012dd618a156327550e59f1 (diff)
parent482995ff8f8efeb83e393a5442f118813e417aa5 (diff)
downloadidea-8d1f0af9d0f1deebcdbdf651905e9371afcd47ac.tar.gz
am 482995ff: am 4e804afa: (-s ours) am b0bcfa7e: am 90ea4e59: Merge "Implement IdeaAndroidProject#getAllSourceProviders" into studio-1.4-dev automerge: f3dbe41 automerge: 4120b18
* commit '482995ff8f8efeb83e393a5442f118813e417aa5':
0 files changed, 0 insertions, 0 deletions