summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus inste...Evan Charlton2014-05-143-12/+10
|\
| * Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of s...Evan Charlton2014-05-143-12/+10
* | Merge "Add a new resource for HDMI-CEC logical device type definition"Jinsuk Kim2014-05-142-0/+14
|\ \
| * | Add a new resource for HDMI-CEC logical device type definitionJinsuk Kim2014-05-132-0/+14
* | | am ae4388f7: am 0f582284: am 980a285b: am 5eb99943: Merge "update wear refere...Dirk Dougherty2014-05-148-414/+543
|\ \ \
| * \ \ am 0f582284: am 980a285b: am 5eb99943: Merge "update wear reference docs to s...Dirk Dougherty2014-05-148-414/+543
| |\ \ \
| | * \ \ am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky...Dirk Dougherty2014-05-148-414/+543
| | |\ \ \
| | | * \ \ am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT ...Dirk Dougherty2014-05-148-414/+543
| | | |\ \ \
| | | | * \ \ Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL ...Dirk Dougherty2014-05-148-414/+543
| | | | |\ \ \
| | | | | * | | update wear reference docs to support sticky nav.Scott Main2014-05-138-414/+543
* | | | | | | | Merge "resolved conflices for merge of 93ccd1a2 to master"Dirk Dougherty2014-05-14307-6768/+12589
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflices for merge of 93ccd1a2 to masterDirk Dougherty2014-05-14307-6768/+12589
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | am 0540bc37: am a4e6c7d1: am 3506ac87: Doc change: Updated content for distri...Dirk Dougherty2014-05-14307-6280/+12099
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.Dirk Dougherty2014-05-14307-6280/+12099
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am 3506ac87: Doc change: Updated content for distribute.Dirk Dougherty2014-05-14307-6280/+12099
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Doc change: Updated content for distribute.Dirk Dougherty2014-05-14307-6280/+12099
* | | | | | | | Merge "Fix reboot loop due to NPE."Sreeram Ramachandran2014-05-141-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix reboot loop due to NPE.Sreeram Ramachandran2014-05-141-0/+2
* | | | | | | | | Merge "Fix typo in comment"David Christie2014-05-141-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typo in commentDavid Christie2014-05-141-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge "Handle normalization of a "null" phone number."Andrew Lee2014-05-141-0/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Handle normalization of a "null" phone number.Andrew Lee2014-05-141-0/+4
* | | | | | | | | Merge "Fix potential crash in libandroidfw"Adam Lesinski2014-05-141-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix potential crash in libandroidfwAdam Lesinski2014-05-141-1/+1
* | | | | | | | | | merge master nova by hand, skipped translationsEd Heyl2014-05-14309-3733/+4717
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | am b7e6a817: Merge "PowerManager: Minor Coding style issues."Ruchi Kandoi2014-05-121-9/+15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 5ba476c3: Merge "Make sessions aware of user id"RoboErik2014-05-125-49/+138
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 9fca9ecb: Merge "notification ranking infrastructure"Chris Wren2014-05-1216-534/+867
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 8ce0c4b3: am 728614e4: am c5df4d0e: Merge "BootReceiver: add ro.boot.bootr...Simon Wilson2014-05-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | am 631fa0d0: Merge "Improved stack scroll range logic and more card backgroun...Selim Cinek2014-05-123-27/+22
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am b0a630fb: Merge "Fix clipping and outline for top quick settings header."Jorim Jaggi2014-05-121-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 5b3a28e9: am 82c93357: (-s ours) am 05c581ac: Merge "DO NOT MERGE Hide mor...Tim Kilbourn2014-05-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f939e960: am 0ff8f796: (-s ours) am d6fc5115: Merge "DO NOT MERGE Hide lea...Tim Kilbourn2014-05-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 05400140: Merge "Fix magnitude of AbsListView nested scrolling offset"Yorke Lee2014-05-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7003af19: Merge "Directly start to collapse QS when overscrolling."Jorim Jaggi2014-05-122-1/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2fbcff12: Merge "First pass on multinetwork framework"Robert Greenwalt2014-05-128-11/+192
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9c889271: Merge "Add support for building split APKs"Adam Lesinski2014-05-1237-1931/+2543
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9a273b89: Merge "Support for hollow switch and seek bar thumbs"Alan Viverette2014-05-1224-118/+244
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5efd55a1: Merge "Fix nested scrolling bugs in AbsListView"Yorke Lee2014-05-121-10/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d4accb98: Merge "Define audio attributes"Jean-Michel Trivi2014-05-122-0/+483
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bf857065: Merge "Support multiple calls to AsyncChannel.disconnect"Robert Greenwalt2014-05-121-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fbba06df: Merge "Turn down the logging."Robert Greenwalt2014-05-121-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8b05d273: Merge "Flush dump output before calling score cache dump() metho...Jeff Davidson2014-05-121-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e27bfe30: Merge "Fix QuickSettings header state on Keyguard."Jorim Jaggi2014-05-122-10/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 913f7dcc: Merge "Set primary color of SystemUI."Jorim Jaggi2014-05-125-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5c0f5df4: Merge "Corrected top stack logic of notifications again."Selim Cinek2014-05-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b1c07444: Implement intermediate brigthness control on header.Jorim Jaggi2014-05-128-15/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 790489fa: Merge "Implement settings affordance in header."Jorim Jaggi2014-05-1216-75/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3838b611: Improved the notification stack logic furtherSelim Cinek2014-05-125-40/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 964ba838: Remove an unused member.Yohei Yukawa2014-05-121-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \