OSDN Git Service

Merge "Fix 2527411: Extend sample DPM app to test setMaximumTimeToLock()" into froyo
authorJim Miller <jaggies@google.com>
Tue, 30 Mar 2010 20:51:57 +0000 (13:51 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 30 Mar 2010 20:51:57 +0000 (13:51 -0700)

Trivial merge