summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvel...Shishir Agrawal2014-03-143-10/+12
* am eb7bd8bb: Merge "Fixed a bug where the current wallpaper could be reset on...Selim Cinek2014-03-101-6/+14
|\
| * Merge "Fixed a bug where the current wallpaper could be reset on an update"Selim Cinek2014-03-101-6/+14
| |\
| | * Fixed a bug where the current wallpaper could be reset on an updateSelim Cinek2014-03-061-6/+14
* | | am fc558d56: Fix compiler warning in Activity.java.John Spurlock2014-03-101-1/+3
|\ \ \ | |/ /
| * | Fix compiler warning in Activity.java.John Spurlock2014-03-101-1/+3
* | | am 863d691e: Merge "Fix build"Jessica Hummel2014-03-101-1/+1
|\ \ \ | |/ /
| * | Merge "Fix build"Jessica Hummel2014-03-101-1/+1
| |\ \
| | * | Fix buildJessica Hummel2014-03-101-1/+1
* | | | am b5c4e7fd: resolved conflicts for merge of 92860a74 to masterNarayan Kamath2014-03-109-137/+139
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of 92860a74 to masterNarayan Kamath2014-03-109-137/+139
| |\ \ \ | | |/ / | |/| |
| | * | am 8272c84c: am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architectu...Narayan Kamath2014-03-109-135/+136
| | |\ \
| | | * \ am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-109-135/+136
| | | |\ \
| | | | * \ am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-109-135/+136
| | | | |\ \
| | | | | * \ Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-109-135/+136
| | | | | |\ \
| | | | | | * | LP64: Make 9 patches architecture agnostic.Narayan Kamath2014-03-109-135/+136
| | | | | |/ /
* | | | | | | am df897d08: Merge "Extend DeviceAdminReceiver to receive provisioning comple...Jessica Hummel2014-03-102-22/+55
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Extend DeviceAdminReceiver to receive provisioning complete broadcast."Jessica Hummel2014-03-102-22/+55
| |\ \ \ \ \ \
| | * | | | | | Extend DeviceAdminReceiver to receive provisioning complete broadcast.Jessica Hummel2014-03-062-22/+55
* | | | | | | | am 30c86ad4: Merge "Improve doc for EditorInfo#initialSel{Start,End}"Jean Chalard2014-03-093-62/+94
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Improve doc for EditorInfo#initialSel{Start,End}"Jean Chalard2014-03-103-62/+94
| |\ \ \ \ \ \ \
| | * | | | | | | Improve doc for EditorInfo#initialSel{Start,End}Jean Chalard2014-02-213-62/+94
* | | | | | | | | am 6f91cedf: am c9d49ff0: (-s ours) am e3318add: am 1062080c: am 0ea81eed: (-...Wei Wang2014-03-080-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am c9d49ff0: (-s ours) am e3318add: am 1062080c: am 0ea81eed: (-s ours) am 13...Wei Wang2014-03-080-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | am e3318add: am 1062080c: am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT M...Wei Wang2014-03-080-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | am 1062080c: am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peri...Wei Wang2014-03-080-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (...Wei Wang2014-03-080-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mo...Wei Wang2014-03-088-93/+394
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into...Wei Wang2014-03-088-93/+394
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.Wei Wang2014-03-068-93/+394
* | | | | | | | | | | | | am 4234344a: am e61accbe: am 62563523: am c4a6df22: am 96192157: am f175b19a:...Adam Powell2014-03-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am e61accbe: am 62563523: am c4a6df22: am 96192157: am f175b19a: Merge "Fix a...Adam Powell2014-03-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 62563523: am c4a6df22: am 96192157: am f175b19a: Merge "Fix a bug where On...Adam Powell2014-03-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am c4a6df22: am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListener...Adam Powell2014-03-080-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListeners in action v...Adam Powell2014-03-080-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | | | * | | | | | | | am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be...Adam Powell2014-03-071-18/+18
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | Merge "Fix a bug where OnTouchListeners in action views could be removed" int...Adam Powell2014-03-071-18/+18
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Fix a bug where OnTouchListeners in action views could be removedAdam Powell2014-03-061-18/+18
* | | | | | | | | | | | | | am 73149b3b: am 7c1a11c4: am 1b49f105: am bf0fdac1: am f41efb44: am 57a45f22:...Marco Nelissen2014-03-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 7c1a11c4: am 1b49f105: am bf0fdac1: am f41efb44: am 57a45f22: Merge "Fix a...Marco Nelissen2014-03-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 1b49f105: am bf0fdac1: am f41efb44: am 57a45f22: Merge "Fix a JNI local re...Marco Nelissen2014-03-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | am bf0fdac1: am f41efb44: am 57a45f22: Merge "Fix a JNI local reference leak ...Marco Nelissen2014-03-080-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | am f41efb44: am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPl...Marco Nelissen2014-03-080-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | | | * | | | | | | | | am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener:...Marco Nelissen2014-03-071-0/+1
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / /
| | | | | | * | | | | | | | Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." int...Marco Nelissen2014-03-071-0/+1
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | Fix a JNI local reference leak in JNIMediaPlayerListener::notify.Elliott Hughes2014-03-071-0/+1
* | | | | | | | | | | | | | | am 2ab1c09b: am 889f705d: (-s ours) am f8c4c3c7: am 508e88e3: am 9bf7f893: (-...Craig Mautner2014-03-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 889f705d: (-s ours) am f8c4c3c7: am 508e88e3: am 9bf7f893: (-s ours) am 93...Craig Mautner2014-03-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am f8c4c3c7: am 508e88e3: am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the...Craig Mautner2014-03-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am 508e88e3: am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if ...Craig Mautner2014-03-080-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /