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