| commit | 85a8301a6d63be2efa8b2440ca694c3707b2f536 | [log] [tgz] |
|---|---|---|
| author | Andrew Shulaev <ddrone@google.com> | Thu Aug 27 21:59:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:59:38 2015 +0000 |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | e3f1b9f2fd24b5beaa880386f966d0adc59091eb [diff] | |
| parent | 51e0e94d4195b3cf5ab5bde6b0916f95e1188282 [diff] |
am 51e0e94d: am 6c09071b: (-s ours) am 77c9a57c: am d815dbb0: Merge "Fix IndexNotReadyException in layout editor" into studio-1.4-dev automerge: 9f218ff automerge: 7b5c3b4 * commit '51e0e94d4195b3cf5ab5bde6b0916f95e1188282':