tree da38cf01501810661d8f082a3a2eeda802c2361e
parent 35647888f3be4f479515539062eabcd2dace96c5
parent 0b28b42c0f2d94777b517c7f270956240978e4dd
author Dmitry Kalita <rusmonster@gmail.com> 1458154762 +0000
committer android-build-merger <android-build-merger@google.com> 1458154762 +0000

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

* commit '0b28b42c0f2d94777b517c7f270956240978e4dd':
  Fix restoring of layer type