summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Me...Adrian Roos2015-09-240-0/+0
|\
| * am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send ...Adrian Roos2015-09-244-2/+57
| |\
| | * am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s...Adrian Roos2015-09-244-2/+57
| | |\
| | | * am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent ...Adrian Roos2015-09-244-2/+57
| | | |\
| | | | * am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIn...Adrian Roos2015-09-244-2/+57
| | | | |\
| | | | | * Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp...Adrian Roos2015-09-244-2/+57
| | | | | |\
| | | | | | * DO NOT MERGE Send next alarm's show intent via PendingIntentAdrian Roos2015-09-154-2/+57
* | | | | | | am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'...Paul Jensen2015-09-230-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark Networ...Paul Jensen2015-09-231-1/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests res...Paul Jensen2015-09-231-1/+5
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when ...Paul Jensen2015-09-231-1/+5
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t h...Paul Jensen2015-09-231-1/+5
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge "Don't mark NetworkRequests restricted when they don't have restricted ...Paul Jensen2015-09-231-1/+5
| | | | | |\ \
| | | | | | * | Don't mark NetworkRequests restricted when they don't have restricted capsPaul Jensen2015-08-281-1/+5
* | | | | | | | am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Me...Paul Jensen2015-09-230-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED...Paul Jensen2015-09-236-44/+109
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capa...Paul Jensen2015-09-236-44/+109
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and en...Paul Jensen2015-09-236-44/+109
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." in...Paul Jensen2015-09-236-44/+109
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-devPaul Jensen2015-09-236-44/+109
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Fix NOT_RESTRICTED network capability and enforce it.Paul Jensen2015-08-286-44/+109
* | | | | | | | am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am...Zach Jang2015-09-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am...Zach Jang2015-09-210-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am...Zach Jang2015-09-210-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO...Zach Jang2015-09-210-0/+0
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - ...Zach Jang2015-09-170-0/+0
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of a...Zach Jang2015-09-170-0/+0
| | | | | |\ \ \
| | | | | | * \ \ am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Sec...Zach Jang2015-09-171-0/+15
| | | | | | |\ \ \
| | | | | | | * \ \ am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch l...Zach Jang2015-09-171-0/+15
| | | | | | | |\ \ \
| | | | | | | | * | | DO NOT MERGE - Backport of ag/748165 to klp-devZach Jang2015-09-171-0/+15
* | | | | | | | | | | am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO...Zach Jang2015-09-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport o...Zach Jang2015-09-211-0/+15
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 t...Zach Jang2015-09-211-0/+15
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Sec...Zach Jang2015-09-211-0/+15
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch l...Zach Jang2015-09-171-0/+15
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | DO NOT MERGE - Backport of ag/748165 to klp-devZach Jang2015-09-171-0/+15
| | | | | | |_|_|_|/ | | | | | |/| | | |
* | | | | | | | | | Relax locking when scanning private volumes.Jeff Sharkey2015-09-171-7/+31
* | | | | | | | | | am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp...Zach Riggle2015-09-170-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-devZach Riggle2015-09-170-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 683cd049: resolved conflicts for 521def98 to lmp-mr1-devZach Riggle2015-09-170-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | resolved conflicts for 521def98 to lmp-mr1-devZach Riggle2015-09-170-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | am 4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for di...Michael Wright2015-09-121-2/+53
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.Michael Wright2015-08-281-2/+53
| | | | | | |_|_|/ | | | | | |/| | |
* | | | | | | | | am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO N...Zach Jang2015-09-160-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the t...Zach Jang2015-09-161-3/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for un...Zach Jang2015-09-161-3/+5
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s...Zach Jang2015-09-161-3/+5
| | | |\ \ \ \ \ \
| | | | * | | | | | Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""Zach Jang2015-09-161-3/+5
* | | | | | | | | | am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE...Zach Jang2015-09-160-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout f...Zach Jang2015-09-161-5/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /