Etan Cohen
bc3d106b97
Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
2016-09-23 03:59:40 +00:00
Kevin Hufnagle
e20b3d78e3
docs: Removed all instances of "i.e." in IntentFilter parameter
...
descriptions.
Bug: 5877117
Change-Id: Iccb16589a72d3180330f13ec224578a0c5ad81c6
2016-09-22 18:33:57 -07:00
Christopher Wiley
4fd00327fd
Merge changes from topic 'remove-set-frequency-band' am: 430904a4ab
...
am: 5135fb8f04
2016-09-22 23:59:48 +00:00
Christopher Wiley
a04b2b5f36
Remove ability to set frequency from WifiAssociationTest am: 93ce63760d
...
am: 4bec7b53b0
2016-09-22 23:58:52 +00:00
Christopher Wiley
af51ffe814
Remove WifiManager#get/setFrequencyBand am: 79ec1736be
...
am: a7394a4a70
2016-09-22 23:57:42 +00:00
Christopher Wiley
5135fb8f04
Merge changes from topic 'remove-set-frequency-band'
...
am: 430904a4ab
2016-09-22 23:52:02 +00:00
Christopher Wiley
4bec7b53b0
Remove ability to set frequency from WifiAssociationTest
...
am: 93ce63760d
2016-09-22 23:51:57 +00:00
Christopher Wiley
a7394a4a70
Remove WifiManager#get/setFrequencyBand
...
am: 79ec1736be
2016-09-22 23:50:58 +00:00
Christopher Wiley
430904a4ab
Merge changes from topic 'remove-set-frequency-band'
...
* changes:
Remove ability to set frequency from WifiAssociationTest
Remove WifiManager#get/setFrequencyBand
2016-09-22 23:34:17 +00:00
Jaewan Kim
2f713b8ad7
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5 am: 5b649ddcc6 -s ours
...
am: e36701214a
2016-09-22 23:17:29 +00:00
Kevin Hufnagle
b10a6dc963
docs: Fixed misspelling in "Address" class overview.
...
Bug: 30608455
Change-Id: Ic7d8492b15eeffe32393c018f3512101d5f0bcae
2016-09-22 16:14:27 -07:00
Jaewan Kim
9b2aeba20a
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320 am: 03bad07418 am: afab98a69e -s ours
...
am: 738c21253a
2016-09-22 23:08:31 +00:00
Jaewan Kim
e36701214a
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5
...
am: 5b649ddcc6
2016-09-22 23:08:24 +00:00
Pavlin Radoslavov
d0113aab0c
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" am: 3b0256fc73
...
am: 829285c38e
2016-09-22 22:57:06 +00:00
Jaewan Kim
738c21253a
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320 am: 03bad07418
...
am: afab98a69e
2016-09-22 22:51:23 +00:00
Colin Cross
e43f2d4ef5
Merge "aapt: remove duplicate definition of ZD" am: ac2d839d7c
...
am: 3efa1e7c17
2016-09-22 22:51:08 +00:00
Jaewan Kim
5b649ddcc6
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074
...
am: 1ab448b5d5
2016-09-22 22:40:32 +00:00
Pavlin Radoslavov
829285c38e
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
...
am: 3b0256fc73
2016-09-22 22:39:31 +00:00
Jaewan Kim
afab98a69e
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320
...
am: 03bad07418
2016-09-22 22:39:30 +00:00
Jaewan Kim
1ab448b5d5
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31
...
am: 09edfde074
2016-09-22 22:27:37 +00:00
Jaewan Kim
03bad07418
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055
...
am: 351aa0b320
2016-09-22 22:26:12 +00:00
Jaewan Kim
09edfde074
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours
...
am: 2cd4383c31
2016-09-22 22:21:52 +00:00
Jaewan Kim
351aa0b320
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours
...
am: e9a9e2f055
2016-09-22 22:20:54 +00:00
Android Build Merger (Role)
3434f0f59e
Merge "Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce -s ours am: 1c278e5652 am: bed7636243 am: dd883c7e87 am: 832179120f -s ours am: c547eeda12" into nyc-dev-plus-aosp
2016-09-22 21:57:59 +00:00
Jaewan Kim
c9ceffd16c
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce -s ours am: 1c278e5652 am: bed7636243 am: dd883c7e87 am: 832179120f -s ours
...
am: c547eeda12
2016-09-22 21:57:09 +00:00
Jaewan Kim
2cd4383c31
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81
...
am: 585f642d65
2016-09-22 21:56:51 +00:00
Android Build Merger (Role)
9e2319e78c
Merge "DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours am: fa9983ec73 am: 900d1c90b3 am: 0e31d93890 am: 4da22f27f6 -s ours am: 36068a2f00" into nyc-dev-plus-aosp
2016-09-22 21:56:36 +00:00
Treehugger Robot
3b0256fc73
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
2016-09-22 21:56:10 +00:00
Jaewan Kim
6afd6e51fb
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours am: fa9983ec73 am: 900d1c90b3 am: 0e31d93890 am: 4da22f27f6 -s ours
...
am: 36068a2f00
2016-09-22 21:55:59 +00:00
Jaewan Kim
e9a9e2f055
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9
...
am: ed3e26e2be
2016-09-22 21:55:51 +00:00
liulvping
fb55d69029
Merge "Skip uninstalled package for getPackagesForUid()" am: f4c8c3590a
...
am: 659cdfef75
2016-09-22 21:55:31 +00:00
Colin Cross
3efa1e7c17
Merge "aapt: remove duplicate definition of ZD"
...
am: ac2d839d7c
2016-09-22 21:55:27 +00:00
Andrew Solovay
f955d4cd9f
docs: Removed two images that were moved to Piper in April
...
Scott had migrated these graphics to Piper in April, but they've
stayed in Gerrit. These graphics had been updated in Gerrit since
then, so they got out of sync with Piper.
Set up Critique CL cr/133998971 to migrate the latest versions
to Piper (and sent to Scott for review); setting up a separate
CL here to remove the files, so they won't accidentally get
edited in the wrong place again.
Change-Id: Ice9dda71ae3604b1fc3aab15746dc41e759b80a6
2016-09-22 14:24:57 -07:00
Treehugger Robot
ac2d839d7c
Merge "aapt: remove duplicate definition of ZD"
2016-09-22 21:24:49 +00:00
Android Build Merger (Role)
8ac28b8659
Merge "Merge "Remove has_trivial_move trait from StringPool types" am: d333f28397 am: 6f02f57f12" into nyc-dev-plus-aosp
2016-09-22 20:35:10 +00:00
Jaewan Kim
c547eeda12
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce -s ours am: 1c278e5652 am: bed7636243 am: dd883c7e87
...
am: 832179120f
2016-09-22 20:35:00 +00:00
Jaewan Kim
585f642d65
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79
...
am: 462493ee81
2016-09-22 20:34:22 +00:00
Jaewan Kim
36068a2f00
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours am: fa9983ec73 am: 900d1c90b3 am: 0e31d93890
...
am: 4da22f27f6
2016-09-22 20:33:44 +00:00
Colin Cross
57ef0a40f1
Merge "Remove has_trivial_move trait from StringPool types" am: d333f28397
...
am: 6f02f57f12
2016-09-22 20:33:25 +00:00
Jaewan Kim
ed3e26e2be
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9
...
am: 3ea1f124f9
2016-09-22 20:33:24 +00:00
Ajay Panicker
b5b69a2004
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c -s ours am: 0029d03c0a am: afeaced48f am: 2a214fc5f2 am: 0ec10c8fdc -s ours
...
am: 916552b0c9
2016-09-22 20:33:21 +00:00
liulvping
659cdfef75
Merge "Skip uninstalled package for getPackagesForUid()"
...
am: f4c8c3590a
2016-09-22 20:30:51 +00:00
Jaewan Kim
832179120f
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce -s ours am: 1c278e5652 am: bed7636243
...
am: dd883c7e87
2016-09-22 20:05:57 +00:00
Jaewan Kim
462493ee81
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours
...
am: ded4df2e79
2016-09-22 20:05:49 +00:00
Pavlin Radoslavov
74f60c0de8
Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind
...
Add a missing call to remove all MESSAGE_BIND_PROFILE_SERVICE
message when unbinding and finishing.
Bug: 31442739
Test: manual, and "frameworks/base/core/tests/bluetoothtests" unit tests
Change-Id: I7e9a8f79a38d4eb8ab8b53be04650226fc72732e
2016-09-22 20:05:22 +00:00
Jaewan Kim
3ea1f124f9
DO NOT MERGE Fix build am: dfedca4e43 -s ours
...
am: 499871ebe9
2016-09-22 20:03:57 +00:00
Jaewan Kim
4da22f27f6
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours am: fa9983ec73 am: 900d1c90b3
...
am: 0e31d93890
2016-09-22 20:03:53 +00:00
Treehugger Robot
f4c8c3590a
Merge "Skip uninstalled package for getPackagesForUid()"
2016-09-22 20:00:01 +00:00
Colin Cross
6f02f57f12
Merge "Remove has_trivial_move trait from StringPool types"
...
am: d333f28397
2016-09-22 19:59:13 +00:00
Dirk Dougherty
a0b58a6cf0
Copy IN files to ID, temporarily leaving IN in place.
...
am: 9bbc0a2421
2016-09-22 19:57:05 +00:00
