OSDN Git Service

am dcaba04c: Few tweaks to BlockGuard\'s BlockGuardPolicyException.
authorBrad Fitzpatrick <bradfitz@android.com>
Thu, 15 Jul 2010 21:12:30 +0000 (14:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Jul 2010 21:12:30 +0000 (14:12 -0700)
Merge commit 'dcaba04c224cb5a5ed6af89251ac876ec2f48dfe' into gingerbread-plus-aosp

* commit 'dcaba04c224cb5a5ed6af89251ac876ec2f48dfe':
  Few tweaks to BlockGuard's BlockGuardPolicyException.


Trivial merge