am a2841093: Merging fix for b/4520353 Move make/model usage in field provisioning to server whitelist from mr1 to mr2

* commit 'a2841093fd490041c03002722905d39d049d8229':
  Merging fix for b/4520353 Move make/model usage in field provisioning to server whitelist from mr1 to mr2
This commit is contained in:
Jeffrey Tinker
2011-06-09 13:42:03 -07:00
committed by Android Git Automerger