tree b2dd7f5d60ce4e2e554ab2aa48d1c181a3c945d0
parent 4d88a5d8f449893ae52d552e142668f3ded1e041
parent 30f368fde096a746d5ac407754955691abfc48b7
author Prashant Malani <pmalani@google.com> 1456786964 +0000
committer android-build-merger <android-build-merger@google.com> 1456786964 +0000

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

* commit '30f368fde096a746d5ac407754955691abfc48b7':
  Fixes to wear recovery for N