[automerger skipped] Merge "Make the new proto build" am: 606a64f7da am: 3077dfa613 am: 86f922435f am: aa7c7cc3e9 -s ours

Browse Source

am skip reason: Change-Id I6e71cdd3c129f0437a354c1aa8821df36b8dea74 with SHA-1 ba84008f05 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I398eec9e765bb3ff59651dfc46764c1b9cf5aa0d

...

This commit is contained in:

Tianjie Xu

2021-03-09 21:21:48 +00:00

committed by Automerger Merge Worker

parent 005938771d aa7c7cc3e9

commit d1ba24a1e3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available