diff options
| author | Michal Bendowski <bendowski@google.com> | 2015-08-03 08:48:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-03 08:48:41 +0000 |
| commit | d71f4559de8ab4038feb66890e99993b485f2479 (patch) | |
| tree | 2f4a3e87306ef215c2d88c219a47aef090450b70 /adt-branding | |
| parent | f9a37740b48c714df09b1c9539a0ca9d4e43b308 (diff) | |
| parent | 7351fccad4bd3a5bd0602db0818492a5bccd1dde (diff) | |
| download | idea-d71f4559de8ab4038feb66890e99993b485f2479.tar.gz | |
Merge "resolve merge conflicts of eaefb40 to studio-1.4-dev." into studio-1.4-dev
Diffstat (limited to 'adt-branding')
0 files changed, 0 insertions, 0 deletions