commit | 07e439e1c11b56dd1fa32594cd0fb7d1b36f95a9 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 15 22:48:15 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 15 22:48:15 2021 +0000 |
tree | 2f1411c213cb7b6648d5b2d3f4340cdba014343b | |
parent | e438034aee9c120a378523a0a1026485a0b60086 [diff] | |
parent | 5a9fcc3d76b23732223a94dd3559a3c9c44ccd73 [diff] |
[automerger skipped] Merge "OOB generateLocalOobData" am: 3a4f319145 am: bb6ea3457c am: 5a9fcc3d76 -s ours am skip reason: skip tag Change-Id I2d4167a6c92ee0cc24da12df206838161c8f3318 with SHA-1 ba2c904f8d is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677745 Change-Id: Ie353ad0084ce116285dfef430a5c4d29ad5e3e56