tree 9c6abab38389c7c536cf8beea4e695726e1a15da
parent 65f35b5c3513571c179974829eb93ba069693d2b
parent 0eb41c3f370e89ff40cf1a3bd17e7b785b74641e
author Prashant Malani <pmalani@google.com> 1456786590 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456786590 +0000

Merge "Fixes to wear recovery for N" into nyc-dev