tree ed8b3128a3fb2fd26aa2b69a6431a3818657a6e3
parent 2d8c91f238e49889a1315301c5e9266faff549bc
parent 0271fd661dc547e15495e31913d5cde4f122dde9
author TreeHugger Robot <treehugger-gerrit@google.com> 1467164281 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467164282 +0000

Merge changes Id876f01f,If7c94cf8 into nyc-mr1-dev

* changes:
  Improving the Reset Demo Warning dialog
  Enabling auto-ota in retail demo mode