summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash ...Craig Mautner2014-12-011-4/+14
|\
| * Merge "[ActivityManager] Avoid system server crash due to package removed"Craig Mautner2014-12-011-4/+14
| |\
| | * [ActivityManager] Avoid system server crash due to package removedlouis_chang2014-07-311-4/+14
* | | am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."Narayan Kamath2014-11-273-8/+63
|\ \ \ | |/ /
| * | Stop using ErrorStrings for apache.Narayan Kamath2014-11-273-8/+63
* | | am bedb1378: am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" c...Narayan Kamath2014-11-273-94/+57
|\ \ \ | |/ /
| * | Delete general sounding "CharArrayBuffers" class.Narayan Kamath2014-11-273-94/+57
* | | am f0c22b0c: am 14e28134: Merge "Delete unused class from android.net.http."Narayan Kamath2014-11-271-41/+0
|\ \ \ | |/ /
| * | Delete unused class from android.net.http.Narayan Kamath2014-11-271-41/+0
| * | [WebView] Allow the WebView to be compiled against the system SDK.Ignacio Solla2014-11-2524-603/+292
* | | am ec26692d: am 9b35b801: Merge "CameraManager: Separate service listener int...Eino-Ville Talvala2014-11-271-144/+191
|\ \ \
| * \ \ am 9b35b801: Merge "CameraManager: Separate service listener into a singleton...Eino-Ville Talvala2014-11-271-144/+191
| |\ \ \
| | * \ \ Merge "CameraManager: Separate service listener into a singleton" into lmp-mr...Eino-Ville Talvala2014-11-271-144/+191
| | |\ \ \
| | | * | | CameraManager: Separate service listener into a singletonEino-Ville Talvala2014-11-261-144/+191
* | | | | | am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-de...Jorim Jaggi2014-11-263-73/+41
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-devJorim Jaggi2014-11-263-73/+41
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-devJorim Jaggi2014-11-263-73/+41
| | |\ \ \ \
| | | * | | | Make IKeyguardService interface asynchronousJim Miller2014-11-253-73/+41
* | | | | | | am c8361ba7: am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movemen...Alan Viverette2014-11-263-166/+62
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movement from key pr...Alan Viverette2014-11-263-166/+62
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into...Alan Viverette2014-11-263-166/+62
| | |\ \ \ \ \
| | | * | | | | Revert "Animates AbsSeekBar progress movement from key presses."Alan Viverette2014-11-263-166/+62
| | | |/ / / /
* | | | | | | am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active us...Alan Viverette2014-11-263-6/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather tha...Alan Viverette2014-11-263-6/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Load SPEAK_PASSWORD from currently active user rather than self" into ...Alan Viverette2014-11-263-6/+9
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Load SPEAK_PASSWORD from currently active user rather than selfAlan Viverette2014-11-253-6/+9
| | | |/ / /
* | | | | | am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection...Paul Crowley2014-11-261-6/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 77e25331: Merge "Add flag for wiping factory reset protection data." into ...Paul Crowley2014-11-251-6/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add flag for wiping factory reset protection data.Paul Crowley2014-11-251-6/+14
| | |/ / /
* | | | | am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageS...Adam Lesinski2014-11-251-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 9be305d1: Merge "Make the Context service constant for UsageStats public" ...Adam Lesinski2014-11-251-2/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Make the Context service constant for UsageStats public" into lmp-mr1-devAdam Lesinski2014-11-251-2/+1
| | |\ \ \
| | | * | | Make the Context service constant for UsageStats publicAdam Lesinski2014-11-241-2/+1
* | | | | | am 44c09f29: am 27fbf676: Merge "Update documentation for DatePicker to refle...Alan Viverette2014-11-251-6/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mo...Alan Viverette2014-11-251-6/+22
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Update documentation for DatePicker to reflect the new mode" into lmp-...Alan Viverette2014-11-251-6/+22
| | |\ \ \ \
| | | * | | | Update documentation for DatePicker to reflect the new modeAlan Viverette2014-11-241-6/+22
* | | | | | | am c02cdf00: am 8791a1e8: Merge "Camera2: Ignore unsupported face detection r...Ruben Brunk2014-11-251-1/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEG...Ruben Brunk2014-11-241-1/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lm...Ruben Brunk2014-11-241-1/+3
| | |\ \ \ \ \
| | | * | | | | Camera2: Ignore unsupported face detection results in LEGACY.Ruben Brunk2014-11-201-1/+3
* | | | | | | | am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDra...Alan Viverette2014-11-251-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into...Alan Viverette2014-11-241-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-devAlan Viverette2014-11-241-1/+1
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Check for null drawable in theme-less getDrawable()Alan Viverette2014-11-241-1/+1
| | | | |/ / / | | | |/| | |
* | | | | | | am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." in...Jeff Sharkey2014-11-254-21/+82
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-devJeff Sharkey2014-11-244-21/+82
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Introduce revision codes for split APKs.Jeff Sharkey2014-11-244-21/+82
* | | | | | | am 608439df: am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugr...Dianne Hackborn2014-11-252-3/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output"...Dianne Hackborn2014-11-242-3/+5
| |\ \ \ \ \ \ | | |/ / / / /