tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent f4f62cfb2d93637880279a7eb5b9ce2f6bddce82
parent 8267b109552460025be1ec3f004e45dfb467ce4b
author Dmitry Kalita <rusmonster@gmail.com> 1479952199 +0000
committer android-build-merger <android-build-merger@google.com> 1479952199 +0000

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

Change-Id: Ic0084a6a2694b220867f26e18c1294f7b720e703