tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 2e1bbbbbea60a3e7329d7700800373be4e10acea
parent 8ce0be3353d39d8dd540e1bfdacb88b612bc361f
author Dmitry Kalita <rusmonster@gmail.com> 1479951917 +0000
committer android-build-merger <android-build-merger@google.com> 1479951917 +0000

Merge "Fix restoring of layer type" am: 0b28b42
am: 8ce0be3353  -s ours

Change-Id: I447f0ee5bcf0c7b3db98a1b54cb4cfb061a7541f