summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add Java doc comments on script group name reuseYang Ni2015-06-281-0/+2
* Merge "fix temp white list update in device idle" into mnc-devXiaohui Chen2015-06-271-5/+2
|\
| * fix temp white list update in device idleXiaohui Chen2015-06-261-5/+2
* | Merge "Properly scope the "only http/https schemes" intent filter semantics" ...Christopher Tate2015-06-272-12/+31
|\ \
| * | Properly scope the "only http/https schemes" intent filter semanticsChristopher Tate2015-06-262-12/+31
* | | Merge "BatteryStats: Record suspend abort reasons" into mnc-devAdam Lesinski2015-06-272-47/+38
|\ \ \
| * | | BatteryStats: Record suspend abort reasonsAdam Lesinski2015-06-252-47/+38
* | | | Merge "Update the sensors group label" into mnc-devSvetoslav2015-06-271-1/+1
|\ \ \ \
| * | | | Update the sensors group labelSvetoslav2015-06-261-1/+1
* | | | | Merge "Looks like MNC is gonna be API 23." into mnc-devDianne Hackborn2015-06-273-3/+3
|\ \ \ \ \
| * | | | | Looks like MNC is gonna be API 23.Dianne Hackborn2015-06-263-3/+3
* | | | | | Merge "Write size of operators in writeToParcel()" into mnc-devAnil Muthineni2015-06-261-0/+1
|\ \ \ \ \ \
| * | | | | | Write size of operators in writeToParcel()Anil Muthineni2015-06-261-0/+1
* | | | | | | am 293facf4: (-s ours) am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am...Amit Mahajan2015-06-260-0/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6:...Amit Mahajan2015-06-260-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE...Amit Mahajan2015-06-260-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to ad...Amit Mahajan2015-06-260-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISS...Amit Mahajan2015-06-260-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk r...Amit Mahajan2015-06-260-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.Amit Mahajan2015-06-261-0/+5
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | DO NOT MERGE Change to add STK_PERMISSION for stk related commands.Amit Mahajan2015-06-261-0/+5
* | | | | | | | | | | | | Merge "Don't apply existing keyguard animation to IME window" into mnc-devJorim Jaggi2015-06-261-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Don't apply existing keyguard animation to IME windowJorim Jaggi2015-06-261-1/+3
* | | | | | | | | | | | | | am 1573d8ef: (-s ours) am d98e7c1d: am 7278b043: am 895eb134: am 90224355: DO...Amit Mahajan2015-06-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am d98e7c1d: am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to ad...Amit Mahajan2015-06-261-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISS...Amit Mahajan2015-06-261-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk r...Amit Mahajan2015-06-261-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.Amit Mahajan2015-06-261-0/+5
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | DO NOT MERGE Change to add STK_PERMISSION for stk related commands.Amit Mahajan2015-06-261-0/+5
* | | | | | | | | | | | | | am 76e42bdd: am 3686e043: am 268a7c19: am fc7e84b3: Merge "docs: manifest mer...Rich Slogar2015-06-262-0/+512
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 3686e043: am 268a7c19: am fc7e84b3: Merge "docs: manifest merger updates" ...Rich Slogar2015-06-262-0/+512
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 268a7c19: am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docsRich Slogar2015-06-262-0/+512
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docsRich Slogar2015-06-262-0/+512
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "docs: manifest merger updates" into lmp-docsRich Slogar2015-06-262-0/+512
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | docs: manifest merger updatesRich Slogar2015-06-262-0/+512
* | | | | | | | | | | | | | | | | | am b3d02465: am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms wh...Prashant Malani2015-06-261-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considerin...Prashant Malani2015-06-261-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Revert "Always re-establish kernel alarms when considering new alarm s...Prashant Malani2015-06-261-4/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Revert "Always re-establish kernel alarms when considering new alarm set"Prashant Malani2015-06-241-4/+2
* | | | | | | | | | | | | | | | | | | am cf05e318: am 2a1be1bc: Docs: Added declaration to code fragment Bug: 21030774Robert Schaub2015-06-261-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 2a1be1bc: Docs: Added declaration to code fragment Bug: 21030774Robert Schaub2015-06-261-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Docs: Added declaration to code fragmentRobert Schaub2015-06-261-1/+2
* | | | | | | | | | | | | | | | | | | am 83467228: am 6f6326bc: Implement a exponential backoff for NTP time and XT...Wei Liu2015-06-261-2/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 6f6326bc: Implement a exponential backoff for NTP time and XTRA data retry.Wei Liu2015-06-261-6/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Implement a exponential backoff for NTP time and XTRA data retry.Wei Liu2015-06-251-6/+43
* | | | | | | | | | | | | | | | | | | am 32279219: am fd3b64b8: am b0afc540: docs: Eclipse ADT end-of-life noteRich Slogar2015-06-263-18/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am fd3b64b8: am b0afc540: docs: Eclipse ADT end-of-life noteRich Slogar2015-06-263-18/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am b0afc540: docs: Eclipse ADT end-of-life noteRich Slogar2015-06-263-18/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | docs: Eclipse ADT end-of-life noteRich Slogar2015-06-253-18/+26
* | | | | | | | | | | | | | | | | | | am 4c96c704: am 7d377c3b: am fa5f184f: docs: studio migration guideRich Slogar2015-06-2611-102/+1028
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /