| commit | 0164f5e101d4513b7e87a019689714a953633edd | [log] [tgz] |
|---|---|---|
| author | Yi Kong <yikong@google.com> | Mon May 01 19:02:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 01 19:02:56 2017 +0000 |
| tree | 9079c415bd9aa9815aa612fb66b59f366a9f6bb5 | |
| parent | 5dd466876b51c6cb6b5999f0db25dda1581b80f1 [diff] | |
| parent | d1a0cdc85faa4da2c21428237613406729906374 [diff] |
Merge "Merge "Remove no-op std::max call" am: c00af4c533 am: ef5e579cec am: f3310cb3b1" into oc-dev-plus-aosp am: d1a0cdc85f Change-Id: I5ba3c71615c0c4bbb777d5c31458a586243c67eb