OSDN Git Service

Merge "Fix restoring of layer type" am: 0b28b42
authorDmitry Kalita <rusmonster@gmail.com>
Thu, 24 Nov 2016 01:45:17 +0000 (01:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Nov 2016 01:45:17 +0000 (01:45 +0000)
am: 8ce0be3353  -s ours

Change-Id: I447f0ee5bcf0c7b3db98a1b54cb4cfb061a7541f


Trivial merge