| commit | 1a9b2813c7cfdf539f779d1f9814fe35d14e590d | [log] [tgz] |
|---|---|---|
| author | Jerome Gaillard <jgaillard@google.com> | Thu Aug 27 21:37:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:25 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | fbb83b993b5a112e7badbcd1785a86b931c8a0f1 [diff] | |
| parent | 555d10aef3239c897c6e2e9fb6560f9e385d904a [diff] |
am 555d10ae: am 4e34a738: (-s ours) am 14e705e4: am 59a48820: Merge "Fix the way themes are identified among styles" into studio-1.4-dev automerge: eaa52da automerge: 3084d19 * commit '555d10aef3239c897c6e2e9fb6560f9e385d904a':