OSDN Git Service

Merge "Fix getApplicationRestrictions documentation" into nyc-dev am: a86d6c4df3
authorEsteban Talavera <etalavera@google.com>
Tue, 7 Jun 2016 18:03:33 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 18:03:33 +0000 (18:03 +0000)
commit5e674dea3133a174f455b1b0673ee98332cd72f2
tree64dff856e3b622cbd5af9c30c91aae951faa4e21
parenta063331e29c14abf451eff389bee53ca5a447f03
parent36ff488bb475d52629fea412dcd7af57bb3d441f
Merge "Fix getApplicationRestrictions documentation" into nyc-dev am: a86d6c4df3
am: 36ff488bb4

* commit '36ff488bb475d52629fea412dcd7af57bb3d441f':
  Fix getApplicationRestrictions documentation

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