tree eaf88b6c43acf1613ff6abcfc03fa4a0c247d674
parent a2a13718d00172d224960146e4956de58da5b484
parent 2e6d960c85436b46f71a048a825c545a376fbf06
author Doug Zongker <dougz@google.com> 1395176067 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395176067 +0000

am 2e6d960c: am cdf00888: add option to shutdown after factory reset

* commit '2e6d960c85436b46f71a048a825c545a376fbf06':
  add option to shutdown after factory reset