commit | 52a0ff39b8839d30436eb4d735bf02f8f979c5f1 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 10 21:54:34 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 10 21:54:34 2020 +0000 |
tree | dfd64897fe126fe1bd9c50f8b44675c2330d51ac | |
parent | 4ce5cced0398245cd24c820134d904ab66f4dcaa [diff] | |
parent | 2c918741677d5d8ad7feaf6d262a7b814812bc32 [diff] |
Fix prebuilt_info in R branch so that we don't get merge conflicts again when submitting changes to AOSP am: 25096215cb am: 81c76c281a am: 9041f33362 am: 2c91874167 Change-Id: I63f977ca8bb4697b4e1b0d4e3d85300955c8eaca