am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev

* commit 'd7cdbd4d812f3d3501c37b7242a7038298c7ee14':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
This commit is contained in:
Fyodor Kupolov
2015-08-22 00:17:44 +00:00
committed by Android Git Automerger

View File

@@ -677,7 +677,8 @@ public class RestrictionsManager {
* <table>
* <tr><th>RestrictionEntry</th><th>Bundle</th></tr>
* <tr><td>{@link RestrictionEntry#TYPE_BOOLEAN}</td><td>{@link Bundle#putBoolean}</td></tr>
* <tr><td>{@link RestrictionEntry#TYPE_CHOICE}, {@link RestrictionEntry#TYPE_CHOICE}</td>
* <tr><td>{@link RestrictionEntry#TYPE_CHOICE},
* {@link RestrictionEntry#TYPE_MULTI_SELECT}</td>
* <td>{@link Bundle#putStringArray}</td></tr>
* <tr><td>{@link RestrictionEntry#TYPE_INTEGER}</td><td>{@link Bundle#putInt}</td></tr>
* <tr><td>{@link RestrictionEntry#TYPE_STRING}</td><td>{@link Bundle#putString}</td></tr>