tree 83297223b968edfa1628cf70d1892c3ad960c6d5
parent d4d2ba8037b3262d01ba26a7fe007e86a38b1ab1
parent 4519a02608b9e02a2c0dbc7dff37c21167db8f24
author Jeff Sharkey <jsharkey@android.com> 1315520571 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315520571 -0700

Merge "Always disable() through SBMS; watch date."