summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2015-08-05156-2886/+3249
* am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-devMaurice Lam2015-08-050-0/+0
|\
| * Merge "[Fingerprint] Update string for enrolling" into mnc-devMaurice Lam2015-08-051-5/+5
| |\
| | * [Fingerprint] Update string for enrollingMaurice Lam2015-08-041-5/+5
* | | am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-devMaurice Lam2015-08-051-2/+2
|\ \ \ | |/ /
| * | Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-devMaurice Lam2015-08-051-2/+2
| |\ \ | | |/ | |/|
| | * [Fingerprint] Shrink fingerprint progress ringMaurice Lam2015-08-041-2/+2
* | | [Fingerprint] Update string for enrollingMaurice Lam2015-08-041-5/+5
* | | resolved conflicts for merge of 1adca55f to mnc-dr-devJason Monk2015-08-043-10/+12
|\ \ \ | |/ /
| * | Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_T...Nick Kralevich2015-08-042-45/+32
| |\ \
| | * | UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFERNick Kralevich2015-07-302-45/+32
* | | | Merge "Update USB dialog for USB-C power option" into mnc-dr-devJason Monk2015-08-045-77/+290
|\ \ \ \
| * | | | Update USB dialog for USB-C power optionJason Monk2015-08-045-77/+290
* | | | | am f61ead7a: Make sure accessibility service desc isn\'t clickableJason Monk2015-08-041-0/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Make sure accessibility service desc isn't clickableJason Monk2015-08-041-0/+1
* | | | am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping...Dianne Hackborn2015-08-041-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VI...Dianne Hackborn2015-08-041-2/+2
| |\ \ \
| | * | | Fix issue #22860466: viapi security bug - rubber stamping in nested VIsDianne Hackborn2015-08-031-2/+2
| | | |/ | | |/|
* | | | am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' link...Chris Tate2015-08-041-1/+23
|\ \ \ \ | |/ / /
| * | | Merge "Explain properly when apps can open multiple hosts' links" into mnc-devChris Tate2015-08-041-1/+23
| |\ \ \
| | * | | Explain properly when apps can open multiple hosts' linksChristopher Tate2015-08-031-1/+23
| | |/ /
* | | | am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit...Prem Kumar2015-08-043-55/+40
|\ \ \ \ | |/ / /
| * | | Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-devPrem Kumar2015-08-043-55/+40
| |\ \ \
| | * | | Allow Contact sharing by default while connecting Car Kit.Sanket Padawe2015-07-313-55/+40
* | | | | am 87fadbe6: [Fingerprint] Help text for backup screen lockMaurice Lam2015-08-043-0/+43
|\ \ \ \ \ | |/ / / /
| * | | | [Fingerprint] Help text for backup screen lockMaurice Lam2015-08-033-0/+43
* | | | | am c493f042: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-040-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-0322-1931/+1123
| | |/ / | |/| |
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-0318-156/+86
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-3178-1321/+1271
* | | | am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc...Vinit Deshpande2015-08-011-3/+6
|\ \ \ \ | |/ / /
| * | | Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-devVinit Deshpande2015-08-011-3/+6
| |\ \ \
| | * | | wifi: Check for the sizeof ssid to start SoftAPSunil Dutt2015-07-311-3/+6
* | | | | am efaa19d9: Fix fingerprint enrolling bug.Jim Miller2015-07-311-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | Fix fingerprint enrolling bug.Jim Miller2015-07-311-3/+5
* | | | | am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" int...Maurice Lam2015-07-311-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-devMaurice Lam2015-07-311-0/+1
| |\ \ \ \
| | * | | | [Fingerprint] Disable back in setup enrolling screenMaurice Lam2015-07-301-0/+1
| | |/ / /
* | | | | am 13cbe053: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-310-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-3178-696/+535
* | | | | am c7e59e52: Merge "Let Settings measure transient free space." into mnc-devJeff Sharkey2015-07-311-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Let Settings measure transient free space." into mnc-devJeff Sharkey2015-07-311-0/+1
| |\ \ \ \
| | * | | | Let Settings measure transient free space.Jeff Sharkey2015-07-301-0/+1
* | | | | | am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mn...Maurice Lam2015-07-314-0/+33
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-devMaurice Lam2015-07-314-0/+33
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | [Fingerprint] Advertise wake & unlock during SUWMaurice Lam2015-07-304-0/+33
| | | |/ / | | |/| |
* | | | | am 6b0a2d21: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-300-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-3078-635/+808
* | | | | am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" in...Fyodor Kupolov2015-07-301-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-devFyodor Kupolov2015-07-301-0/+1
| |\ \ \ \
generated by cgit v1.1 at 2024-11-03 22:56:44 +0000