OSDN Git Service

Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev
authorNicolas Prevot <nprevot@google.com>
Thu, 15 Jan 2015 12:28:12 +0000 (12:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 15 Jan 2015 12:28:13 +0000 (12:28 +0000)
commita9f9c4b90a8af25974bc74971efeafa521073df2
tree45a1ba12ebb12514fee6556c121d148df28bd92f
parent2cd3ac4707f32fc296c0b2a8e7e2479d40c9a706
parentb14ed95647ff7c38869550606396d5b784eeece1
Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev
core/java/android/os/UserManager.java