Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Use DisplayAdjustments when creating display in ResourceManager" into ... | Wale Ogunwale | 2015-06-08 | 3 | -25/+32 |
|\ | |||||
| * | Use DisplayAdjustments when creating display in ResourceManager | Wale Ogunwale | 2015-06-06 | 3 | -25/+32 |
* | | Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" i... | Dianne Hackborn | 2015-06-08 | 1 | -4/+4 |
|\ \ | |||||
| * | | Fix issue #21572679: API Review: ActivityOptions, usage time report | Dianne Hackborn | 2015-06-05 | 1 | -4/+4 |
* | | | Merge "MidiManager: proxy all requests to open devices through MidiService" i... | Mike Lockwood | 2015-06-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | MidiManager: proxy all requests to open devices through MidiService | Mike Lockwood | 2015-06-04 | 1 | -1/+1 |
* | | | | Merge "Pass an args bundle to launchAssistAction." into mnc-dev | Tim Kilbourn | 2015-06-08 | 4 | -8/+10 |
|\ \ \ \ | |||||
| * | | | | Pass an args bundle to launchAssistAction. | Tim Kilbourn | 2015-06-05 | 4 | -8/+10 |
* | | | | | Merge "Zen: New user flow for requesting DND access." into mnc-dev | John Spurlock | 2015-06-08 | 3 | -76/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Zen: New user flow for requesting DND access. | John Spurlock | 2015-06-08 | 3 | -76/+27 |
* | | | | | | Merge "Change stylus button press to context click in View - API review feedb... | Mady Mellor | 2015-06-08 | 1 | -6/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Change stylus button press to context click in View - API review feedback | Mady Mellor | 2015-06-05 | 1 | -6/+6 |
* | | | | | | | Don't forget to parcel mIsAppProvidedIntent | Adam Skory | 2015-06-05 | 1 | -0/+2 |
* | | | | | | | Merge "Record provision of custom Intents in AssistContent" into mnc-dev | Adam Skory | 2015-06-06 | 2 | -11/+33 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Record provision of custom Intents in AssistContent | Adam Skory | 2015-06-05 | 2 | -11/+33 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge "Allow different visual and voice assist prompts" into mnc-dev | James Cook | 2015-06-05 | 2 | -12/+160 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Allow different visual and voice assist prompts | James Cook | 2015-06-05 | 2 | -12/+160 |
| |/ / / / / / | |||||
* | | | | | | | Merge "Adding am send-trim-memory command" into mnc-dev | Stefan Kuhne | 2015-06-05 | 3 | -93/+142 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Adding am send-trim-memory command | Stefan Kuhne | 2015-06-05 | 3 | -93/+142 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev | Zoltan Szatmary-Ban | 2015-06-05 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Replace renamed reference to NetworkStats in javadoc | Zoltan Szatmary-Ban | 2015-06-04 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background th... | Filip Gruszczynski | 2015-06-05 | 1 | -14/+31 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | am d88e4d50: Merge "ActivityView: set surface on a background thread." into c... | Filip Gruszczynski | 2015-06-02 | 1 | -14/+31 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | ActivityView: set surface on a background thread. | Filip Gruszczynski | 2015-06-01 | 1 | -14/+31 |
| * | | | | | | | DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev | John Reck | 2015-05-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am d955dceb: am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jan... | John Reck | 2015-05-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into ... | John Reck | 2015-05-14 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Revert "DO NOT MERGE Backport of limited jank-tracking metrics" | John Reck | 2015-05-13 | 1 | -1/+1 |
| * | | | | | | | | | resolved conflicts for merge of e869835d to lmp-mr1-ub-dev | John Reck | 2015-05-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | am a5b28b92: am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracki... | John Reck | 2015-05-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev | John Reck | 2015-05-13 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | * | | | | | | DO NOT MERGE Backport of limited jank-tracking metrics | John Reck | 2015-03-18 | 1 | -1/+1 |
* | | | | | | | | | | Merge "Always have a handler for PendingIntents sent in the system process" i... | Wale Ogunwale | 2015-06-05 | 2 | -1/+17 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Always have a handler for PendingIntents sent in the system process | Wale Ogunwale | 2015-06-04 | 2 | -1/+17 |
* | | | | | | | | | | Merge "Clean up the enter transition even if there is not entering fragment."... | George Mount | 2015-06-04 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Clean up the enter transition even if there is not entering fragment. | George Mount | 2015-06-04 | 1 | -4/+4 |
* | | | | | | | | | | Merge "More API changes." into mnc-dev | Dianne Hackborn | 2015-06-04 | 10 | -69/+141 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | More API changes. | Dianne Hackborn | 2015-06-02 | 10 | -69/+141 |
* | | | | | | | | | | Adding missing permission API to fragment | Svetoslav | 2015-06-03 | 1 | -0/+27 |
| |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
* | | | | | | | | | Merge "Add annotations to a new API" into mnc-dev | Svetoslav | 2015-06-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add annotations to a new API | Svetoslav | 2015-06-02 | 1 | -1/+1 |
* | | | | | | | | | | Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev | Nicolas Prevot | 2015-06-02 | 1 | -9/+43 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Make ACTION_PROVISION_MANAGED_DEVICE public. | Nicolas Prevot | 2015-06-02 | 1 | -9/+43 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge "Fix java doc" into mnc-dev | Svetoslav | 2015-06-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Fix java doc | Svetoslav | 2015-06-02 | 1 | -1/+1 |
* | | | | | | | | | | Merge "Add API to hint whether to show on-board UI before a permission reques... | Svetoslav | 2015-06-02 | 2 | -0/+35 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add API to hint whether to show on-board UI before a permission request. | Svetoslav | 2015-06-02 | 2 | -0/+35 |
* | | | | | | | | | Merge "Temporarily whitelist an app for network during doze" into mnc-dev | Amith Yamasani | 2015-06-02 | 2 | -0/+23 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Temporarily whitelist an app for network during doze | Amith Yamasani | 2015-06-02 | 2 | -0/+23 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Device policy: consistent javadoc and annotations | Robin Lee | 2015-06-02 | 1 | -225/+227 |
| |/ / / / / / |/| | | | | | |