| commit | 29dc917b16f0522dfaf367a70ae99186344e1f0e | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Jul 28 00:13:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 00:13:58 2015 +0000 |
| tree | 682b4469285422aafbb2200ce4e2b815bc108ec1 | |
| parent | 86162e6439e8035494b187efbf138d9cabae92fb [diff] | |
| parent | d4ff228319d8382a062c9843511d760d1933a9f4 [diff] |
am d4ff2283: Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION." * commit 'd4ff228319d8382a062c9843511d760d1933a9f4': Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION.