summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Support RSA encrypt using private key and PKCS#1 paddding.Alex Klyubin2015-06-252-18/+66
* Merge "Use standard copyright banner in android/security/keymaster." into mnc...Alex Klyubin2015-06-2517-49/+49
|\
| * Use standard copyright banner in android/security/keymaster.Alex Klyubin2015-06-2417-49/+49
* | Merge "Track rename of INT and LONG Keymaster tag types." into mnc-devAlex Klyubin2015-06-255-28/+28
|\ \
| * | Track rename of INT and LONG Keymaster tag types.Alex Klyubin2015-06-245-28/+28
| |/
* | Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-devJason Monk2015-06-251-0/+1
|\ \
| * | Make BluetoothEventManager listen to ALIAS_CHANGEDJason Monk2015-06-031-0/+1
* | | ICU format support for pseudolocalizes.Igor Viarheichyk2015-06-255-67/+419
* | | Merge "Don't lose critical success/failure messages" into mnc-devErik Kline2015-06-251-2/+2
|\ \ \
| * | | Don't lose critical success/failure messagesErik Kline2015-06-241-2/+2
* | | | Merge "iUpdate the sensor group description" into mnc-devSvetoslav2015-06-251-1/+1
|\ \ \ \
| * | | | iUpdate the sensor group descriptionSvetoslav2015-06-241-1/+1
* | | | | am a50fa710: (-s ours) am 001df9ca: DO NOT MERGE: Introduce stem keycodes for...Anthony Hugh2015-06-250-0/+0
|\ \ \ \ \
| * \ \ \ \ am 001df9ca: DO NOT MERGE: Introduce stem keycodes for WearAnthony Hugh2015-06-252-2/+19
| |\ \ \ \ \
| | * | | | | DO NOT MERGE: Introduce stem keycodes for WearAnthony Hugh2015-06-242-2/+19
* | | | | | | Merge "Make NONEwithECDSA truncate input when necessary." into mnc-devAlex Klyubin2015-06-258-44/+147
|\ \ \ \ \ \ \
| * | | | | | | Make NONEwithECDSA truncate input when necessary.Alex Klyubin2015-06-248-44/+147
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Frameworks/base: Add tracing system properties" into mnc-devAndreas Gampe2015-06-251-0/+20
|\ \ \ \ \ \ \
| * | | | | | | Frameworks/base: Add tracing system propertiesAndreas Gampe2015-06-221-0/+20
* | | | | | | | Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-devDave Langemak2015-06-251-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Throw IAE on invalid measure spec size"Dave Langemak2015-06-251-3/+0
* | | | | | | | | Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mn...Amith Yamasani2015-06-251-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | No need to check WRITE_SETTINGS permission in ContentProviderAmith Yamasani2015-06-241-1/+0
* | | | | | | | | | Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-devAlan Viverette2015-06-251-11/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Avoid negative childSpecSize in RelativeLayoutAlan Viverette2015-06-241-11/+10
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-devAdam Powell2015-06-251-1/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix ChooserActivity check for still-alive ChooserTargetsAdam Powell2015-06-241-1/+12
* | | | | | | | | | | Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-devztenghui2015-06-242-12/+76
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resize the VectorDrawable according to the virtual Dpiztenghui2015-06-242-12/+76
* | | | | | | | | | | | Merge "Update local state when creating LayerDrawable from constant state" in...Alan Viverette2015-06-245-20/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update local state when creating LayerDrawable from constant stateAlan Viverette2015-06-245-20/+28
* | | | | | | | | | | | | Rename and add carrier config keys for volte and ims.Junda Liu2015-06-243-5/+25
* | | | | | | | | | | | | Merge "add cpuset support" into mnc-devTim Murray2015-06-242-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add cpuset supportTim Murray2015-06-222-2/+25
* | | | | | | | | | | | | | Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-devSelim Cinek2015-06-241-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed an inconsistency when booting up with SIMPInSelim Cinek2015-06-241-1/+3
* | | | | | | | | | | | | | | Merge "Fixed a bug with encryption where the keyguard was never shown with PI...Selim Cinek2015-06-244-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Fixed a bug with encryption where the keyguard was never shown with PINSelim Cinek2015-06-244-5/+16
* | | | | | | | | | | | | | | Merge "remove setLatestEventInfo" into mnc-devChris Wren2015-06-245-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | remove setLatestEventInfoChris Wren2015-06-245-2/+17
* | | | | | | | | | | | | | | am 1ee8470c: am 3eefa1f9: Merge "docs: Update Android support page" into mnc-...Joe Fernandez2015-06-241-73/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 3eefa1f9: Merge "docs: Update Android support page" into mnc-preview-docsJoe Fernandez2015-06-241-73/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "docs: Update Android support page" into mnc-preview-docsJoe Fernandez2015-06-241-73/+89
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | docs: Update Android support pageJoe Fernandez2015-06-241-73/+89
* | | | | | | | | | | | | | | | | Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityM...Adam Lesinski2015-06-245-8/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#...Adam Lesinski2015-06-245-8/+26
* | | | | | | | | | | | | | | | | | Merge "Update the internal test case to show the strokeWidth can scale now" i...ztenghui2015-06-242-6/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Update the internal test case to show the strokeWidth can scale nowztenghui2015-06-242-6/+1
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Catching launch errors when trying to go Home while Home is updating."...Winson Chung2015-06-241-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Catching launch errors when trying to go Home while Home is updating.Winson Chung2015-06-241-4/+10