summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Shulaev <ddrone@google.com>2015-08-27 11:15:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 11:15:43 +0000
commit51e0e94d4195b3cf5ab5bde6b0916f95e1188282 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parent7d99d81182adacbb11e2bf200f70aa0e15ef2e55 (diff)
parent6c09071b699a7d12ba7be81eca384fb11f298292 (diff)
downloadidea-51e0e94d4195b3cf5ab5bde6b0916f95e1188282.tar.gz
am 6c09071b: (-s ours) am 77c9a57c: am d815dbb0: Merge "Fix IndexNotReadyException in layout editor" into studio-1.4-dev automerge: 9f218ff automerge: 7b5c3b4
* commit '6c09071b699a7d12ba7be81eca384fb11f298292':
0 files changed, 0 insertions, 0 deletions