summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | am c7beecd0: (-s ours) am b28a3f90: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am b28a3f90: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | am 13dbe636: am f1c2dc56: am 0e9f1183: Strings for the progress dialog shown ...Esteban Talavera2015-07-171-2/+4
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am f1c2dc56: am 0e9f1183: Strings for the progress dialog shown when clearing...Esteban Talavera2015-07-171-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | am ae8a0e23: (-s ours) am 139ca533: (-s ours) Merge "Import translations. DO ...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 139ca533: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | am 55cf31d9: (-s ours) am 05c0531a: (-s ours) am ac0d197d: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am 05c0531a: (-s ours) am ac0d197d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | am 13dc7ba5: am e12df056: am 8e1c5db7: Check for invalid Wifi security type i...Rubin Xu2015-07-141-1/+10
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am e12df056: am 8e1c5db7: Check for invalid Wifi security type in ManagedProv...Rubin Xu2015-07-131-1/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | am 8c066246: am a7a0d81b: am 073c85a3: Merge "Warn about theft protection in ...Rubin Xu2015-07-144-4/+40
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | am a7a0d81b: am 073c85a3: Merge "Warn about theft protection in all provision...Rubin Xu2015-07-134-4/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | am bef36a91: (-s ours) am 62e6170e: (-s ours) am adcee75c: (-s ours) Import t...Geoff Mendal2015-07-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am 62e6170e: (-s ours) am adcee75c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | am f066eb97: (-s ours) am 649dc46a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 649dc46a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | am e49d06c9: am 3284ddf0: am b039f9de: Merge "call startActivityForResult on ...Rubin Xu2015-07-102-3/+2
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am 3284ddf0: am b039f9de: Merge "call startActivityForResult on remove accoun...Rubin Xu2015-07-102-3/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | am 1109c849: am f9bab601: am 90d051c3: Merge "Don\'t show Wi-Fi select for ED...Craig Lafayette2015-07-094-4/+10
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | am f9bab601: am 90d051c3: Merge "Don\'t show Wi-Fi select for EDU secondary u...Craig Lafayette2015-07-094-4/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | am 1776a29c: (-s ours) am e91e0567: (-s ours) am a0cc1d21: (-s ours) Import t...Geoff Mendal2015-07-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | am e91e0567: (-s ours) am a0cc1d21: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 30cca6f6: am 86820233: am 0ed91ac2: Merge "Also fetch disabled activities ...Esteban Talavera2015-07-071-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 86820233: am 0ed91ac2: Merge "Also fetch disabled activities when disablin...Esteban Talavera2015-07-071-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 6ede3129: (-s ours) am 7148615f: (-s ours) am d03eacd8: (-s ours) Import t...Geoff Mendal2015-07-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 7148615f: (-s ours) am d03eacd8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2cee833b: Merge "Comment that account migration must happen after setting ...Benjamin Franz2015-07-061-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8466ff16: Merge "Code defensively when showing profile deletion dialog" in...Rubin Xu2015-07-011-7/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 43c85039: Merge "Avoid deleting IMEs during DO provisioning." into mnc-devSudheer Shanka2015-06-291-3/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c5efbe68: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f9971247: Merge "Start MP on secondary users only if a DIA is installed." ...Craig Lafayette2015-06-291-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ba19a7e0: Merge changes from topic \'managedprovisioningtests\' into mnc-devBenjamin Franz2015-06-255-0/+219
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 16b3740c: Merge "Set "supportsRtl" to true in manifest." into mnc-devSudheer Shanka2015-06-251-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 67bc3658: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e2e12958: Ignore internal extras if ManagedProvisioning is started by untr...Rubin Xu2015-06-247-18/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 507270de: Merge "Remove unused storage permission." into mnc-devKenny Guy2015-06-231-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 55db88a8: Merge "Resume the PO provisioning after the encryption reboot." ...Sudheer Shanka2015-06-2312-347/+500
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0ca09ea2: Merge "Enfoce permission on NFC bump" into mnc-devRubin Xu2015-06-221-6/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ce3500f5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 86ec373c: Improve theft protection warning message.Rubin Xu2015-06-191-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a7cf1cde: String change on theft protection warning message.Rubin Xu2015-06-191-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 25062c52: Merge "Remove Bluetooth permissions from NanagedProvisioning" in...Craig Lafayette2015-06-171-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 044bae1e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 572b8eb2: Deprecate SHA-1 in ManagedProvisioningRubin Xu2015-06-163-37/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dfcb74bc: Merge "Do not validate FRP if started by setup wizard" into mnc-devRubin Xu2015-06-151-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3d712499: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f61dcc82: Merge "Show a confirmation dialog when user cancels PO flow." in...Sudheer Shanka2015-06-122-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d1e9a73c: Parse AdminExtrasBundle if started by ACTION_PROVISION_MANAGED_D...Rubin Xu2015-06-121-9/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3dbc0916: Merge "Change references to APK Certificate to Signature" into m...Rubin Xu2015-06-123-49/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4f24758b: Merge "Improve accessibility services by adding talk back descri...Sudheer Shanka2015-06-127-3/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \