Steve McKay 8020fecc40 Merge "Use device model and name for internal storage." into nyc-dev
am: d53f0df7df

* commit 'd53f0df7dfb1eee22f7953870ed9d24688596712':
  Use device model and name for internal storage.
2016-03-03 01:19:13 +00:00
..
2016-02-22 07:15:15 -08:00