commit | 627873f3a6fd586c6e8e21fc995d590450c13615 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue Feb 09 03:19:10 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 09 03:19:10 2021 +0000 |
tree | 905b286826dd7888713a804ea5d5cc3b3d67dbc5 | |
parent | a9b9fe40c28882f3db0b13dc9ac9b00b0fd2eab1 [diff] | |
parent | 677f8c48f4d4376ae2853b5446c1fd639a8e00c0 [diff] |
Merge "Stop #define'ing __ANDROID_API__." am: 94be650e36 am: 73a4ac7daf am: 677f8c48f4 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1580211 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I66d850d16d5ff7c480cb5f8506801660dbb84b3f