| commit | a55e3ed8bf726e61186d5bb2271c3eab597b44d9 | [log] [tgz] |
|---|---|---|
| author | Nicolas Prevot <nprevot@google.com> | Thu Jan 15 12:50:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 15 12:50:29 2015 +0000 |
| tree | 00b125cde755e341cb6077dfd4b22ff8f137b979 | |
| parent | b66fa17901d43a79956cd24882969d2b59a07f8b [diff] | |
| parent | 97c1882719437d4b4d8ce99d53ffc400975fdd5e [diff] |
am 97c18827: am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev * commit '97c1882719437d4b4d8ce99d53ffc400975fdd5e': Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING