tree 7365c90aa9cca235f99fd73989839a1919d70517
parent 21c005476699a3892a3b5c16a1cd7a4907988c6b
parent f6ffefb11690ca3604df7c8c0ddda74387d26eba
author Alex Deymo <deymo@google.com> 1457070436 +0000
committer android-build-merger <android-build-merger@google.com> 1457070436 +0000

Merge "Restore labels on /postinstall during recovery." am: 60eae72ac6
am: f6ffefb116

* commit 'f6ffefb11690ca3604df7c8c0ddda74387d26eba':
  Restore labels on /postinstall during recovery.