summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Ruiz <alruiz@google.com>2015-08-27 21:57:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:57:20 +0000
commitbb3b7849726448705431783899e192adb91b9ac4 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parentae67b78729d78745745bbdcebfaeb233b4573433 (diff)
parent34799eedb2d22977854b37fc424d230034534929 (diff)
downloadidea-bb3b7849726448705431783899e192adb91b9ac4.tar.gz
am 34799eed: am 45dbad67: (-s ours) am daae90db: am 473ea4d5: Merge "Trivially implement AndroidModel interface." into studio-1.4-dev automerge: 5796c79 automerge: 6b9a03d
* commit '34799eedb2d22977854b37fc424d230034534929':
0 files changed, 0 insertions, 0 deletions