am c4663ee2: am 30429ac6: Tiny code fix required for http://b/2260798 .

Merge commit 'c4663ee241328180131fd1c44f4c3e11c3e43e71' into eclair-mr2-plus-aosp

* commit 'c4663ee241328180131fd1c44f4c3e11c3e43e71':
  Tiny code fix required for http://b/2260798 .
tree: 07428a1ebfbb69a235b39262e7eff9d4d082a3d0
  1. policy/