tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent f73d67225e1a4576aae676f8cb802911f53b45d4
parent 64ac4368c6a3b960fa09fc629d4306f099c06de7
author Dmitry Kalita <rusmonster@gmail.com> 1479952037 +0000
committer android-build-merger <android-build-merger@google.com> 1479952037 +0000

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

Change-Id: I3f38aef2a8976a7c0578b61b625f7ca3cba4d022