summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | instrument emergency call buttonChris Wren2015-06-052-0/+3
* | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-0877-639/+597
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-639/+597
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Don't cause requestLayout when transition changes Visibility." into mn...George Mount2015-06-083-12/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Don't cause requestLayout when transition changes Visibility.George Mount2015-06-053-12/+22
| | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-0877-84/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-84/+87
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-089-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-089-12/+12
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Add demo mode to tuner" into mnc-devJason Monk2015-06-085-1/+202
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add demo mode to tunerJason Monk2015-06-085-1/+202
* | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-0877-462/+231
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-462/+231
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Show Cast Tile when trustedJason Monk2015-06-084-5/+62
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Setup service for tunable things to use." into mnc-devJason Monk2015-06-089-134/+307
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Setup service for tunable things to use.Jason Monk2015-06-079-134/+307
* | | | | | | | | | | | | | | | | | | | Merge "Correctly time out CMD_START_DHCP." into mnc-devLorenzo Colitti2015-06-081-18/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Correctly time out CMD_START_DHCP.Lorenzo Colitti2015-06-081-18/+60
* | | | | | | | | | | | | | | | | | | | | Merge "Correct the docs for getUserBadgedIcon" into mnc-devKenny Guy2015-06-081-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Correct the docs for getUserBadgedIconKenny Guy2015-05-291-4/+5
* | | | | | | | | | | | | | | | | | | | | Merge "Fix ActionMode.snooze API" into mnc-devAbodunrinwa Toki2015-06-086-37/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix ActionMode.snooze APIAbodunrinwa Toki2015-06-056-37/+42
* | | | | | | | | | | | | | | | | | | | | Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-devMartijn Coenen2015-06-087-63/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Remove NFC CardEmulation dynamic resource APIs.Martijn Coenen2015-06-057-63/+7
* | | | | | | | | | | | | | | | | | | | | | Merge "Catch BadTokenException and continue in clearInsetofPreviousIme." into...Seigo Nonaka2015-06-081-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Catch BadTokenException and continue in clearInsetofPreviousIme.Seigo Nonaka2015-06-081-5/+11
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Delete code that checks for the simulator, it's long gone." into mnc-devLorenzo Colitti2015-06-081-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Delete code that checks for the simulator, it's long gone.Lorenzo Colitti2015-06-051-8/+0
* | | | | | | | | | | | | | | | | | | | | | Merge "MediaController: Keep the controller when touch exploration is enabled...Jae Seo2015-06-061-13/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | MediaController: Keep the controller when touch exploration is enabledJae Seo2015-06-051-13/+26
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fix Bitmap parceling through ashmem." into mnc-devJeff Brown2015-06-064-86/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Fix Bitmap parceling through ashmem.Jeff Brown2015-06-064-86/+123
* | | | | | | | | | | | | | | | | | | | | | | | Don't forget to parcel mIsAppProvidedIntentAdam Skory2015-06-051-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Record provision of custom Intents in AssistContent" into mnc-devAdam Skory2015-06-064-11/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Record provision of custom Intents in AssistContentAdam Skory2015-06-054-13/+37
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" ...Eino-Ville Talvala2015-06-061-10/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIEDEino-Ville Talvala2015-06-041-10/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Implement getColorFilter() on VectorDrawable" into mnc-devAlan Viverette2015-06-061-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Implement getColorFilter() on VectorDrawableAlan Viverette2015-06-051-0/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fail sanity check when BSSID is empty in RTT request" into mnc-devWei Wang2015-06-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fail sanity check when BSSID is empty in RTT requestWei Wang2015-06-051-1/+2
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mnc-dev' of https://googleplex-android.googlesource.com/_direct...Heidi von Markham2015-06-061-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Camera2: add missing HFR implementation" into mnc-devZhijun He2015-06-061-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Camera2: add missing HFR implementationZhijun He2015-06-051-3/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into ...Joe Fernandez2015-06-062-32/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docsJoe Fernandez2015-06-042-32/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docsJoe Fernandez2015-06-042-32/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "docs: studio 1.2.2.0 updates"Joe Fernandez2015-06-042-32/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6715ef75: am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Rever...Justin Harrison2015-06-061-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "Du...Justin Harrison2015-06-041-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \