| commit | fa162a891c80d4225768618b6ed9203a663648e8 | [log] [tgz] |
|---|---|---|
| author | Michal Bendowski <bendowski@google.com> | Thu Aug 27 21:37:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:19 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | e7d375631107a8c531e0c4636d429e9a8736ce79 [diff] | |
| parent | 242ab5a2f855215645bb0eca2541e9ac3dd4d0e4 [diff] |
am 242ab5a2: am 3d0be8e3: (-s ours) am e3876591: am 5a9049fc: Merge "Capitalize multi-flavor dir names." into studio-1.4-dev automerge: df71467 automerge: 67f4c78 * commit '242ab5a2f855215645bb0eca2541e9ac3dd4d0e4':