am 1251fd2e: (-s ours) am 7fbdc44c: Merge "DO NOT MERGE: Extract MockVendorPolicy, add standard mechanism to inject it." into gingerbread

Merge commit '1251fd2ef389e43663c8520245315f37d2d2d3b1'

* commit '1251fd2ef389e43663c8520245315f37d2d2d3b1':
  DO NOT MERGE: Extract MockVendorPolicy, add standard mechanism to inject it.
This commit is contained in:
Makoto Onuki 2010-09-21 10:45:42 -07:00 committed by Android Git Automerger
commit e9978fb23b

Diff Content Not Available