[automerger skipped] Merge "Don't add API annotations in the internal R.java" am: 0ad81868da am: e7105c397b -s ours am: d10d8981b1 -s ours

Browse Source

am skip reason: Change-Id I613e8611ddaf5f8e4761d351d4cd0142d59c7cc9 with SHA-1 de6e6f2098 is in history

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

Change-Id: I8ed42dea534f8552c9622f6e82d27e85db7b969b

...

This commit is contained in:

Makoto Onuki

2020-06-23 22:10:55 +00:00

committed by Automerger Merge Worker

parent 21b38545cc d10d8981b1

commit 1f725fd561

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