Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev

author Jim Miller <jaggies@google.com>

Wed, 27 Aug 2014 03:08:01 +0000 (03:08 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 27 Aug 2014 03:08:02 +0000 (03:08 +0000)
author Jim Miller <jaggies@google.com>
Wed, 27 Aug 2014 03:08:01 +0000 (03:08 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 27 Aug 2014 03:08:02 +0000 (03:08 +0000)
diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge
author	Jim Miller <jaggies@google.com>
	Wed, 27 Aug 2014 03:08:01 +0000 (03:08 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 27 Aug 2014 03:08:02 +0000 (03:08 +0000)