tree b12e9eb5d8e47be1e77f34c65a3e86edf4d192fd
parent cc7032d1e1dd2064b9c123ea3f3ff0c76d2323f9
parent 95ac9bb99a6a9942c35e80d7755c00c926075f65
author nagendra modadugu <ngm@google.com> 1517084910 -0800
committer nagendra modadugu <ngm@google.com> 1517084910 -0800

Merge remote-tracking branch 'goog/upstream-master' into nos-merge-upstream

* goog/upstream-master:
  keymaster: update ExportKeyResponse message
  Use NUGGET_REBOOT_HARD in citadel_updater --reboot
  Added wait_for_interrupt.
  keymaster: bump proto request buffer size
  Add struct nugget_app_low_power_stats definition
  Add NUGGET_PARAM_GET_LOW_POWER_STATS command
  Fix arg parsing in citadel_updater
  Add password support to citadel_updater
  Add more Nugget Core commands for firmware updates
  keymaster: bump size of params max_count
  Remove unused NUGGET_PARAM_REVERSE command

Change-Id: Ie8d11ddac30bc322b6d2530a055b5a4ba32c9db9