tree d0dc791a67102b0acbaf8336cba6a3b5408e4da2
parent d89443d86603dbc9e02e1db32b9071780b4702bc
parent 6eb300e650a0e3ca0e802203e1718ab5abbb7ce9
author Jaikumar Ganesh <jaikumar@google.com> 1280946535 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1280946535 -0700

Merge "Add Blocked Device property." into gingerbread