| commit | d3e98f1c17c98d5de54b7555c31e9ce0400c6a2c | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Jul 28 00:30:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 00:30:55 2015 +0000 |
| tree | 04d6697379cf1a23ea8a0fb4d5a3f2cd7eae3ef1 | |
| parent | 4cdbb26ca2c0174c6846e1a8a9cf624390c616e9 [diff] | |
| parent | 29dc917b16f0522dfaf367a70ae99186344e1f0e [diff] |
am 29dc917b: am d4ff2283: Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION." * commit '29dc917b16f0522dfaf367a70ae99186344e1f0e': Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION.