Merge "Fix restoring of layer type" am: 0b28b42

Browse Source

am: 8ce0be3353  -s ours

Change-Id: I447f0ee5bcf0c7b3db98a1b54cb4cfb061a7541f

...

This commit is contained in:

Dmitry Kalita

2016-11-24 01:45:17 +00:00

committed by android-build-merger

parent 2e1bbbbbea 8ce0be3353

commit 64ac4368c6

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