| commit | 322d0004ba05e2502ae68d1dd710e545a6f28e05 | [log] [tgz] |
|---|---|---|
| author | bowgotsai <bowgotsai@google.com> | Thu Jan 26 02:40:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 26 02:40:51 2017 +0000 |
| tree | 625fe686ebd190307a145237b217c89d7882cda7 | |
| parent | 16e748e9954253b3486c8d36abca415e3e83217e [diff] | |
| parent | df5efb7e7219bc6be18ec688890553b13d9b2084 [diff] |
Merge "Do not add macro min() definition for C++" am: 95eafbaf0a am: 4a107a12e8 am: c0e5c66110 am: df5efb7e72 Change-Id: I0016cb539abf0cae4924a4935f67bbd87d644440