Tomasz Wasilczyk
dcfb346761
Merge "Make metadata field mandatory for program info struct."
2017-01-07 20:03:45 +00:00
Etan Cohen
9a26e434ba
Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472 am: 0bad91b5ac
...
am: 0232d18805
2017-01-07 18:48:10 +00:00
Etan Cohen
0232d18805
Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472
...
am: 0bad91b5ac
2017-01-07 18:38:08 +00:00
Etan Cohen
0bad91b5ac
Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525
...
am: fd23421472
2017-01-07 18:29:13 +00:00
Etan Cohen
fd23421472
Merge "[AWARE] Simplify Wi-Fi Aware API namespace"
...
am: 834a87d525
2017-01-07 18:20:31 +00:00
Etan Cohen
834a87d525
Merge "[AWARE] Simplify Wi-Fi Aware API namespace"
2017-01-07 18:12:33 +00:00
Jeff Sharkey
8d729e8c14
Merge "Initial API shape for storage statistics."
2017-01-07 16:18:38 +00:00
TreeHugger Robot
4f302baba3
Merge "Moved implicit intents into explicit intents"
2017-01-07 06:02:31 +00:00
Jack Yu
5569246e93
Moved implicit intents into explicit intents
...
Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.
The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver
bug: 33783447
Test: manual
Change-Id: I64db3b05400513bacf278ff9f93236495860803e
2017-01-06 21:59:48 -08:00
David Friedman
8aab9e2296
Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: a303af44f9" into nyc-mr2-dev-plus-aosp
...
am: cea9b99099
2017-01-07 03:11:43 +00:00
David Friedman
b68cfbad8b
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: a303af44f9
...
am: 7583234ece
2017-01-07 03:11:35 +00:00
David Friedman
e06384c363
Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: b6092f5aed" into nyc-mr2-dev-plus-aosp
...
am: b5aaead225
2017-01-07 03:10:06 +00:00
David Friedman
18fac3085a
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: b6092f5aed
...
am: fa57c1c713
2017-01-07 03:09:56 +00:00
Dave Friedman
ad94eadf64
Merge "Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: 89f96e8fa4" into nyc-mr2-dev-plus-aosp
...
am: b07a52ee91
2017-01-07 03:08:20 +00:00
Dave Friedman
fa1a47e18b
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: 89f96e8fa4
...
am: 696f17fff2
2017-01-07 03:08:12 +00:00
Dave Friedman
a873bf444e
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: fb8676e50c
...
am: 5346355f4d
2017-01-07 03:06:54 +00:00
Android Build Merger (Role)
cea9b99099
Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: a303af44f9" into nyc-mr2-dev-plus-aosp
2017-01-07 03:00:21 +00:00
Android Build Merger (Role)
b5aaead225
Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: b6092f5aed" into nyc-mr2-dev-plus-aosp
2017-01-07 02:59:55 +00:00
David Friedman
7583234ece
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda
...
am: a303af44f9
2017-01-07 02:59:33 +00:00
David Friedman
fa57c1c713
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda
...
am: b6092f5aed
2017-01-07 02:59:13 +00:00
Android Build Merger (Role)
b07a52ee91
Merge "Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: 89f96e8fa4" into nyc-mr2-dev-plus-aosp
2017-01-07 02:59:09 +00:00
Dave Friedman
696f17fff2
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579
...
am: 89f96e8fa4
2017-01-07 02:58:22 +00:00
Dave Friedman
5346355f4d
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579
...
am: fb8676e50c
2017-01-07 02:58:15 +00:00
David Friedman
b6092f5aed
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca
...
am: d8e95f6bda
2017-01-07 02:51:16 +00:00
David Friedman
a303af44f9
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca
...
am: d8e95f6bda
2017-01-07 02:51:15 +00:00
Dave Friedman
fb8676e50c
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0
...
am: eedb695579
2017-01-07 02:50:18 +00:00
Dave Friedman
89f96e8fa4
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0
...
am: eedb695579
2017-01-07 02:50:17 +00:00
TreeHugger Robot
44a64f0a8c
Merge "Make REQUEST_NETWORK_SCORES signature only."
2017-01-07 02:49:11 +00:00
TreeHugger Robot
54f0fd1071
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
2017-01-07 02:48:44 +00:00
David Friedman
d8e95f6bda
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266
...
am: bcc449eeca
2017-01-07 02:46:33 +00:00
Dave Friedman
eedb695579
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b
...
am: a111e0f7f0
2017-01-07 02:43:44 +00:00
Dmitry Dementyev
ed92d5b55b
Merge "Implement Account Discovery API."
2017-01-07 02:41:44 +00:00
David Friedman
bcc449eeca
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826
...
am: c3b564e266
2017-01-07 02:39:33 +00:00
Dave Friedman
a111e0f7f0
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe
...
am: e0fd4c8a3b
2017-01-07 02:38:45 +00:00
David Friedman
c3b564e266
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev
...
am: 101f885826
2017-01-07 02:30:48 +00:00
Dave Friedman
e0fd4c8a3b
Docs: Updates Javadoc documentation. Bug: 32532540
...
am: 2a3ebadcbe
2017-01-07 02:30:45 +00:00
David Friedman
101f885826
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev
2017-01-07 02:24:57 +00:00
TreeHugger Robot
1198e13594
Merge "libandroidfw: Revert null check in ApplyStyle"
2017-01-07 02:20:17 +00:00
Alex Naidis
09e3c9b78c
Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am: 0b325c6634 am: fd55f834c8 am: 80888cdcbe
...
am: 2603aab95c
2017-01-07 01:52:33 +00:00
Adam Lesinski
6224a32197
Merge changes from topic 'learned_capacity'
...
* changes:
BatteryStats: Report learned battery capacity as event
Parcel/unparcel charge_full state from BatteryProperties
2017-01-07 01:51:07 +00:00
Alex Naidis
2603aab95c
Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am: 0b325c6634 am: fd55f834c8
...
am: 80888cdcbe
2017-01-07 01:48:19 +00:00
Alex Naidis
80888cdcbe
Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am: 0b325c6634
...
am: fd55f834c8
2017-01-07 01:44:14 +00:00
Pavlin Radoslavov
607ed23030
Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8 am: d190040dd1 am: 8905569c67
...
am: afdf387e13
2017-01-07 01:40:55 +00:00
Alex Naidis
fd55f834c8
Merge "DefaultPermissionGrantPolicy: Pass correct arguments"
...
am: 0b325c6634
2017-01-07 01:40:42 +00:00
Pavlin Radoslavov
afdf387e13
Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8 am: d190040dd1
...
am: 8905569c67
2017-01-07 01:36:47 +00:00
Stefan Kuhne
643ba812eb
Merge "Apps which do not support density cannot be resized"
2017-01-07 01:35:02 +00:00
Treehugger Robot
0b325c6634
Merge "DefaultPermissionGrantPolicy: Pass correct arguments"
2017-01-07 01:33:18 +00:00
Pavlin Radoslavov
8905569c67
Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8
...
am: d190040dd1
2017-01-07 01:29:44 +00:00
Pavlin Radoslavov
d190040dd1
Merge "Add Bluetooth Codec selection UI to the Developer Options"
...
am: bfd7f9a1f8
2017-01-07 01:25:34 +00:00
Treehugger Robot
bfd7f9a1f8
Merge "Add Bluetooth Codec selection UI to the Developer Options"
2017-01-07 01:19:33 +00:00
