diff options
| author | Andrew Shulaev <ddrone@google.com> | 2015-08-27 21:56:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 21:56:52 +0000 |
| commit | dfa9d81cb7898fc660d74e89591830e9ce78d07b (patch) | |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | 628f7d1d713179b8167767ca3d83db655670cb62 (diff) | |
| parent | 79ec89abc41ee2448afe55545a57ec357e3bb171 (diff) | |
| download | idea-dfa9d81cb7898fc660d74e89591830e9ce78d07b.tar.gz | |
am 79ec89ab: am 955095ea: (-s ours) am 99676c0c: am 6737d5bd: Merge "Use proper ThemeResolver in tests of resolveAllAttributes" into studio-1.4-dev automerge: 520de3f automerge: cdd3c27
* commit '79ec89abc41ee2448afe55545a57ec357e3bb171':
0 files changed, 0 insertions, 0 deletions