[automerger skipped] Merge "API: Remove ViewDebug.ExportedProperty and CapturedViewProperty from current.txt" am: 274911fd70 am: f8c6eb678b -s ours am: 7151f089b8 -s ours

Browse Source

am skip reason: Change-Id I99ed93e96f7465f1f7c9a32c3715a874055dc809 with SHA-1 7e703b445e is in history

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

Change-Id: I7214ffbc42e966b1adc4ca8fb88292c821040a3e

...

This commit is contained in:

Treehugger Robot

2020-06-10 17:08:01 +00:00

committed by Automerger Merge Worker

parent adf77ebc3e 7151f089b8

commit 676f2451d0

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