am c5908853: am 1fb2a6cd: reconcile main tree with open-source eclair

Merge commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373'

* commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373':
  android-2.1_r1 snapshot
tree: 3d537ed38a9757756751321e4b94efab7b2e721f
  1. policy/