commit | ca6425cd6fd8e4699424b0852d4d8dec608679bf | [log] [tgz] |
---|---|---|
author | Jaikumar Ganesh <jaikumar@google.com> | Thu Aug 05 11:45:44 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 05 11:45:44 2010 -0700 |
tree | 30fbfeb62560c8503a6f8e32e9624c129f98c194 | |
parent | 977ab0269572700c224d2f1f25f6ffdf1a30d7a0 [diff] | |
parent | fbf99d0cb931593be7a009bf94cb2cfaf357e0ac [diff] |
am c4ed734b: am 737998f5: Merge "Add Blocked Device property." into gingerbread Merge commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c' * commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c': Add Blocked Device property.