tree 8d124203531c85c1dabe9114d7db5f490eba1d5f
parent bc11dd8b7c675ff21ca505d9d67154f04d2862a9
parent 9db7964834694e10ce0945e17ac7fefc066d8deb
author Prashant Malani <pmalani@google.com> 1456786770 +0000
committer android-build-merger <android-build-merger@google.com> 1456786770 +0000

Merge "Fixes to wear recovery for N" into nyc-dev
am: 9db7964834

* commit '9db7964834694e10ce0945e17ac7fefc066d8deb':
  Fixes to wear recovery for N