diff options
| author | Jens Ole Lauridsen <jlauridsen@google.com> | 2015-08-27 21:56:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 21:56:08 +0000 |
| commit | 18e4558e7f88bf51f82845060633c7c625442670 (patch) | |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | b1aa3a37abee5040e78a4d1519d7f732e0afdaee (diff) | |
| parent | 0acd38aa70fca3bdbaf313cc1158ac8f3505c452 (diff) | |
| download | idea-18e4558e7f88bf51f82845060633c7c625442670.tar.gz | |
am 0acd38aa: am 86bef3c7: (-s ours) am 0cfa4173: am 4cdb7d47: Merge "Nele: Add dependency checks for palette." into studio-1.4-dev automerge: 0eb409c automerge: ad2b731
* commit '0acd38aa70fca3bdbaf313cc1158ac8f3505c452':
0 files changed, 0 insertions, 0 deletions