summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to...Zach Jang2015-09-161-5/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into...Zach Jang2015-09-161-5/+3
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."Zach Jang2015-09-151-5/+3
* | | | | | | Default grant SMS and Phone to the verifierSvet Ganov2015-09-121-0/+2
* | | | | | | Add op package to the UID special case handling in account manager.Svetoslav2015-09-101-0/+1
* | | | | | | Merge "Add get_accounts app op" into mnc-devSvetoslav Ganov2015-09-096-58/+86
|\ \ \ \ \ \ \
| * | | | | | | Add get_accounts app opSvetoslav2015-09-086-58/+86
* | | | | | | | am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.go...Android Git Automerger2015-09-080-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/...Android Git Automerger2015-09-080-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ am 4b32b3f4: Merge "docs: change intro and title for contacts and sign-in les...Cheryl Potter2015-09-083-6/+5
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge "docs: change intro and title for contacts and sign-in lesson, and remo...Cheryl Potter2015-09-083-6/+5
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | docs: change intro and title for contacts and sign-in lesson, and remove empt...Cheryl Potter2015-09-083-6/+5
* | | | | | | | | | | am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, an...Cheryl Potter2015-09-083-6/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | docs: change intro and title for contacts and sign-in lesson, and remove empt...Cheryl Potter2015-09-083-6/+5
| |/ / / / / / / /
* | | | | | | | | am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in ...Cheryl Potter2015-09-041-33/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sig...Cheryl Potter2015-09-041-33/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "docs: changed references to Google+ sign-in to Google sign-in" into mn...Cheryl Potter2015-09-041-33/+17
| | |\ \ \ \ \ \ \
| | | * | | | | | | docs: changed references to Google+ sign-in to Google sign-inCheryl Potter2015-08-211-33/+17
| | | |/ / / / / /
* | | | | | | | | am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.Renato Mangini2015-09-041-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.Renato Mangini2015-09-041-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Minor fix on Auto Desktop Head Unit doc.Renato Mangini2015-08-271-1/+1
* | | | | | | | | Merge "Don't crash on (invalid) hardware address lengths > 127." into mnc-devIan Pedowitz2015-09-032-2/+83
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't crash on (invalid) hardware address lengths > 127.Lorenzo Colitti2015-09-032-2/+83
* | | | | | | | | | Merge "Don't drop runtime permissions on older system app update." into mnc-devSvetoslav Ganov2015-09-031-6/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't drop runtime permissions on older system app update.Svetoslav2015-09-021-6/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." int...Wale Ogunwale2015-09-032-10/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Respect DONT_KILL_APP flag when bringing down a disabled service.Wale Ogunwale2015-09-022-10/+13
* | | | | | | | | | | Apply default link-handling policy at OTA from pre-MChristopher Tate2015-09-021-9/+13
|/ / / / / / / / / /
* | | | | | | | | | Merge "Allow shell to disable keyguard when not secure" into mnc-devTim Kilbourn2015-09-021-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow shell to disable keyguard when not secureTim Kilbourn2015-09-011-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge "Fix Custom action mode menu item onclick is not working" into mnc-devClara Bayarri2015-09-021-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix Custom action mode menu item onclick is not workingClara Bayarri2015-09-011-1/+10
| |/ / / / / / / / /
* | | | | | | | | | Merge "Fixed a crash in the notification group manager" into mnc-devSelim Cinek2015-09-021-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed a crash in the notification group managerSelim Cinek2015-09-021-0/+7
* | | | | | | | | | | am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-021-19/+27
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.Deepanshu Gupta2015-09-011-19/+27
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |