| commit | b9d116067c15fd887d3bc1d85a592dd151661040 | [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 | 09f00f589cd498088c7fb534821d445f50a37a78 | |
| parent | 9e7d6d152bc35fec125e9ccbd58a0df39e9f3db6 [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.