commit | 7534928e6d11f8b61a25b7e944f594f4e94a321d | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Tue Mar 30 14:12:40 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 30 14:12:40 2010 -0700 |
tree | f1b9f348b03eaeb436c8d762a0807347f268fac4 | |
parent | 4d2fdcfc788f89e69834b90c8bfbae430efb9434 [diff] | |
parent | cb7fb13c10a09f694a444fe042ecb3c6a8e41c66 [diff] |
am cb7fb13c: Merge "Fix 2527411: Extend sample DPM app to test setMaximumTimeToLock()" into froyo