OSDN Git Service

Merge "Fix getApplicationRestrictions documentation" into nyc-dev
authorEsteban Talavera <etalavera@google.com>
Tue, 7 Jun 2016 17:59:01 +0000 (17:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 17:59:01 +0000 (17:59 +0000)
commitcc12064670c9e0ade3ffcb4ff2eed4ddd5d267a8
tree8d5fcc940fa2e2dde5497cfac4424af571407bdb
parent779adf8879f94ffa97d0f889f1376c5bb3929ef4
parenta86d6c4df3b193060b4b725e1abfed4f69689843
Merge "Fix getApplicationRestrictions documentation" into nyc-dev
am: a86d6c4df3

* commit 'a86d6c4df3b193060b4b725e1abfed4f69689843':
  Fix getApplicationRestrictions documentation

Change-Id: Ia552cc886a182f558b7479b1d2a0201061dc5cc6
core/java/android/os/UserManager.java