OSDN Git Service
Tony Mak [Thu, 25 May 2017 19:17:25 +0000 (19:17 +0000)]
Merge "Fix permission is not granted to work profile system app by default" into oc-dev am:
0995b177ab
am:
cb545cb5e2
Change-Id: I6264cd7ef5a570ef40c53b74ee6dbc97ad3215c1
Julia Reynolds [Thu, 25 May 2017 19:11:41 +0000 (19:11 +0000)]
Merge "Fix backup and restore of package blocks" into oc-dev am:
2686322e71
am:
a878ee86ad
Change-Id: I902c07dd5ef4fff5bdab273b2ed81d15f4680d9a
Tony Mak [Thu, 25 May 2017 19:09:24 +0000 (19:09 +0000)]
Merge "Fix permission is not granted to work profile system app by default" into oc-dev
am:
0995b177ab
Change-Id: I0fa9263de3416837f361247ddd95b69cc70b1575
John Reck [Thu, 25 May 2017 19:09:23 +0000 (19:09 +0000)]
Merge "Creating HW bitmaps from RenderNode" into oc-dev am:
d63b77c627
am:
df26122880
Change-Id: I7af81dd30eac562d50540bfb0ac60ffe4270530d
Julia Reynolds [Thu, 25 May 2017 19:03:53 +0000 (19:03 +0000)]
Merge "Fix backup and restore of package blocks" into oc-dev
am:
2686322e71
Change-Id: Ic6d42f58038d7a4feead2f5a3c2c03f11f71e79e
John Reck [Thu, 25 May 2017 19:01:10 +0000 (19:01 +0000)]
Merge "Creating HW bitmaps from RenderNode" into oc-dev
am:
d63b77c627
Change-Id: Ia95a9f190c36999f70fdadbe45e1774beab80988
Felipe Leme [Thu, 25 May 2017 19:00:53 +0000 (19:00 +0000)]
Merge "docs: Clarifying code snippet for View.autoFill()" into oc-dev am:
c8124cb94c
am:
79160ff86b
Change-Id: Id7a00b5e2e544cac3e9de54a7d610b7a3e4c899d
Tony Mak [Thu, 25 May 2017 18:57:32 +0000 (18:57 +0000)]
Merge "Fix permission is not granted to work profile system app by default" into oc-dev
Felipe Leme [Thu, 25 May 2017 18:54:14 +0000 (18:54 +0000)]
Merge "docs: Clarifying code snippet for View.autoFill()" into oc-dev
am:
c8124cb94c
Change-Id: I10f0767e85c25e6257ab2d4f02e5a7d8a0ef6fac
TreeHugger Robot [Thu, 25 May 2017 18:48:56 +0000 (18:48 +0000)]
Merge "Fix backup and restore of package blocks" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 18:48:18 +0000 (18:48 +0000)]
Merge "Creating HW bitmaps from RenderNode" into oc-dev
Felipe Leme [Thu, 25 May 2017 18:39:09 +0000 (18:39 +0000)]
Merge "docs: Clarifying code snippet for View.autoFill()" into oc-dev
Erik Wolsheimer [Thu, 25 May 2017 18:36:02 +0000 (18:36 +0000)]
Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev am:
4c6a49ed47
am:
837e4b34b2
Change-Id: I402f0b15f529d9456b603d30cac09134316ee4e4
Makoto Onuki [Thu, 25 May 2017 18:27:52 +0000 (18:27 +0000)]
Merge "Working around bugreport crash issues" into oc-dev am:
5176a4cda3
am:
44cb1486f3
Change-Id: I70495f11952e9d234d74fa3fd7149dec70fb7350
Erik Wolsheimer [Thu, 25 May 2017 18:22:57 +0000 (18:22 +0000)]
Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev
am:
4c6a49ed47
Change-Id: Ib92f2dbad240bae9f46a23aa61eb2b7d09a96896
Makoto Onuki [Thu, 25 May 2017 18:19:18 +0000 (18:19 +0000)]
Merge "Working around bugreport crash issues" into oc-dev
am:
5176a4cda3
Change-Id: Id5f50a4fad73b51079685b86839ccbe9912c2148
TreeHugger Robot [Thu, 25 May 2017 18:11:47 +0000 (18:11 +0000)]
Merge "wifi: override equals method for WifiSsid"
TreeHugger Robot [Thu, 25 May 2017 18:10:22 +0000 (18:10 +0000)]
Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 18:07:23 +0000 (18:07 +0000)]
Merge "Working around bugreport crash issues" into oc-dev
Eino-Ville Talvala [Thu, 25 May 2017 17:42:41 +0000 (17:42 +0000)]
Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev am:
906948e7e2
am:
d939f92dd0
Change-Id: If83f2175a06961cbe30ab1dfe9b849752ba882f3
Android Build Merger (Role) [Thu, 25 May 2017 17:32:23 +0000 (17:32 +0000)]
Merge "Merge "Fix guest tint" into oc-dev am:
70d4423eb6 am:
dd4a9a2a18"
TreeHugger Robot [Thu, 25 May 2017 17:31:05 +0000 (17:31 +0000)]
Merge "Add Keyguard bottom area overlay."
Jason Monk [Thu, 25 May 2017 17:30:07 +0000 (17:30 +0000)]
Merge "Fix guest tint" into oc-dev am:
70d4423eb6
am:
dd4a9a2a18
Change-Id: I6a765657f600b3d13028c26ba8c9726265721b59
Eino-Ville Talvala [Thu, 25 May 2017 17:25:34 +0000 (17:25 +0000)]
Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev
am:
906948e7e2
Change-Id: I0007db72b0ca923c0e42bbb6ddadf34e927b5612
Jason Monk [Thu, 25 May 2017 17:19:48 +0000 (17:19 +0000)]
Merge "Fix guest tint" into oc-dev
am:
70d4423eb6
Change-Id: I65d05cbf2b3cc31e5fb2376eb3ab9a0782cc0c9d
Eino-Ville Talvala [Thu, 25 May 2017 17:11:00 +0000 (17:11 +0000)]
Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev
Jason Monk [Thu, 25 May 2017 17:09:09 +0000 (17:09 +0000)]
Merge "Fix guest tint" into oc-dev
Jorim Jaggi [Thu, 25 May 2017 17:02:34 +0000 (17:02 +0000)]
Merge "Fix flaky tests" into oc-dev am:
b80cffad4b
am:
9c0e3b433b
Change-Id: I7b21decefdea2bc52a6b9c1283d0189724091488
Dmitri Plotnikov [Thu, 25 May 2017 17:00:23 +0000 (17:00 +0000)]
Merge "Triggering quiescent reboot during OTA" into oc-dev am:
d9417c53e0
am:
a376eed263
Change-Id: I9796f43fc6dd78f40883c154f0e77f5b438e6bd8
Jorim Jaggi [Thu, 25 May 2017 16:53:34 +0000 (16:53 +0000)]
Merge "Fix flaky tests" into oc-dev
am:
b80cffad4b
Change-Id: Ia78dac2c9333a89f48a998b8df9b0f12e78da71c
Steven Moreland [Thu, 25 May 2017 16:52:50 +0000 (16:52 +0000)]
Merge "HIDL: C++ Java parity" am:
475d9b283c am:
101aa88ad6 am:
5b33f9b441
am:
bbb6aea084
Change-Id: I5f678c629e73d4ed281990a620e2c92464d79259
Dmitri Plotnikov [Thu, 25 May 2017 16:51:17 +0000 (16:51 +0000)]
Merge "Triggering quiescent reboot during OTA" into oc-dev
am:
d9417c53e0
Change-Id: I0b2b42d95d739701a367bd5d25bebbd64d033ad0
TreeHugger Robot [Thu, 25 May 2017 16:47:08 +0000 (16:47 +0000)]
Merge "Fix flaky tests" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 16:46:32 +0000 (16:46 +0000)]
Merge "Triggering quiescent reboot during OTA" into oc-dev
Steven Moreland [Thu, 25 May 2017 16:45:48 +0000 (16:45 +0000)]
Merge "HIDL: C++ Java parity" am:
475d9b283c am:
101aa88ad6
am:
5b33f9b441
Change-Id: I7a7ae9d03ad51248526f3e93884e99bf7bc9e0b5
TreeHugger Robot [Thu, 25 May 2017 16:44:36 +0000 (16:44 +0000)]
Merge "Fix warnings surfaced by error-prone."
Steven Moreland [Thu, 25 May 2017 16:39:40 +0000 (16:39 +0000)]
Merge "HIDL: C++ Java parity" am:
475d9b283c
am:
101aa88ad6
Change-Id: If341009ba5c22ec0e83170e856e83b23d8a925ce
Steven Moreland [Thu, 25 May 2017 16:34:21 +0000 (16:34 +0000)]
Merge "HIDL: C++ Java parity"
am:
475d9b283c
Change-Id: I8195a0a4de291f26c637f5cd6802d6bbaf0d17a3
Treehugger Robot [Thu, 25 May 2017 16:28:41 +0000 (16:28 +0000)]
Merge "HIDL: C++ Java parity"
Philip Quinn [Thu, 25 May 2017 16:18:52 +0000 (16:18 +0000)]
Merge "Add metrics constants for the assist gesture."
TreeHugger Robot [Thu, 25 May 2017 15:59:49 +0000 (15:59 +0000)]
Merge "[AWARE] Clarify semantics of service discovery parameters"
Felipe Leme [Thu, 25 May 2017 14:49:21 +0000 (14:49 +0000)]
Merge "Autofill UI should still show when dataset authentication is cancelled." into oc-dev am:
c368c0b5ab
am:
90e52b6e2f
Change-Id: I0f8fd515e4cb17fd8c58c70807c75a51542c8e87
Julia Reynolds [Mon, 22 May 2017 12:45:27 +0000 (08:45 -0400)]
Fix backup and restore of package blocks
-Restore block status for apps that already exist
E.g. apps on the system image
- Stop depending on appops, it's duplicative and
not backuped/restored
Fixes:
38340377
Test: runtest systemui-notification, toast and notification
cts tests, backup android, clear data on packages, restore android,
verify that blocked apps stay blocked.
Change-Id: I29a33d7db2701bd64a7b30411dcf77c0a2f321d1
Felipe Leme [Thu, 25 May 2017 14:38:10 +0000 (14:38 +0000)]
Merge "Autofill UI should still show when dataset authentication is cancelled." into oc-dev
am:
c368c0b5ab
Change-Id: I3fe0b21fc76ae8c0edf8c3a742fa4bdbd0173fb2
Felipe Leme [Thu, 25 May 2017 14:32:04 +0000 (14:32 +0000)]
Merge "Autofill UI should still show when dataset authentication is cancelled." into oc-dev
Neil Fuller [Thu, 25 May 2017 11:08:04 +0000 (11:08 +0000)]
Merge "Remove time_zones_by_country.xml file" am:
3436fd4833 am:
1541ef3712 am:
4e9c135a5a
am:
4e9e1ea566
Change-Id: I444faff9c0f779f4c4e99949efb393d0cad66913
Neil Fuller [Thu, 25 May 2017 11:01:07 +0000 (11:01 +0000)]
Merge "Remove time_zones_by_country.xml file" am:
3436fd4833 am:
1541ef3712
am:
4e9c135a5a
Change-Id: I8d03ce9616c702d73fb6a807d45c58afd332b50b
Neil Fuller [Thu, 25 May 2017 10:54:07 +0000 (10:54 +0000)]
Merge "Remove time_zones_by_country.xml file" am:
3436fd4833
am:
1541ef3712
Change-Id: Iba095c44c332658f7eea448dcf653b46bce5d8e8
Neil Fuller [Thu, 25 May 2017 10:46:41 +0000 (10:46 +0000)]
Merge "Remove time_zones_by_country.xml file"
am:
3436fd4833
Change-Id: I75cf86290b0dcc5aa99b9d0ebacbc5aa07269aab
Neil Fuller [Thu, 25 May 2017 10:39:14 +0000 (10:39 +0000)]
Merge "Remove time_zones_by_country.xml file"
Erik Kline [Thu, 25 May 2017 09:22:58 +0000 (09:22 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" into oc-dev am:
fc6e6d1372 -s ours
am:
5c1ee4e165 -s ours
Change-Id: If3bc370e618ebbda7ec21b26c2701f65e8935914
Erik Kline [Thu, 25 May 2017 09:14:17 +0000 (09:14 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" into oc-dev
am:
fc6e6d1372 -s ours
Change-Id: I44c8ac70d0d3c53e52807697e62c40474d5fa356
TreeHugger Robot [Thu, 25 May 2017 09:04:33 +0000 (09:04 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" into oc-dev
Kevin Chyn [Thu, 25 May 2017 04:41:34 +0000 (04:41 +0000)]
Merge "Revert fix for FingerprintManager leak" into oc-dev am:
807a8c6e7c
am:
23e33539cd
Change-Id: Iadbfa00e79d3607fe64186991f008a55ac5b05f3
Kevin Chyn [Thu, 25 May 2017 04:33:07 +0000 (04:33 +0000)]
Merge "Revert fix for FingerprintManager leak" into oc-dev
am:
807a8c6e7c
Change-Id: I9f9132b1785c4e7c7d04dcc7decfbc4e447fbdd0
Kevin Chyn [Thu, 25 May 2017 04:28:09 +0000 (04:28 +0000)]
Merge "Revert fix for FingerprintManager leak" into oc-dev
Selim Cinek [Thu, 25 May 2017 03:43:24 +0000 (03:43 +0000)]
Merge "Fixed an issue where groups could stay userlocked" into oc-dev am:
e736807efd
am:
b150a39b0f -s ours
Change-Id: I80fa9f2dd7cb5d0574aa8f47e2182439177f03c3
Selim Cinek [Thu, 25 May 2017 03:38:01 +0000 (03:38 +0000)]
Merge "Fixed an issue where groups could stay userlocked" into oc-dev
am:
e736807efd
Change-Id: I8d2bdf59d406985ac336eddcf8f868a985f30612
Selim Cinek [Thu, 25 May 2017 03:29:10 +0000 (03:29 +0000)]
Merge "Fixed an issue where groups could stay userlocked" into oc-dev
Selim Cinek [Thu, 25 May 2017 03:27:42 +0000 (03:27 +0000)]
Merge "Fixed an issue where groups could stay userlocked"
Kevin Chyn [Thu, 25 May 2017 03:16:10 +0000 (03:16 +0000)]
Merge "enable FP auth when assistant is showing and device is locked"
Dmitri Plotnikov [Wed, 10 May 2017 23:26:38 +0000 (16:26 -0700)]
Triggering quiescent reboot during OTA
Bug:
34201965
Test: follow instructions in https://docs.google.com/document/d/1RjvUGRi_Ys5-BRoJz6_SnixuipFiF-GAs6CNc7w-Qj0/edit and use fake-ota
Change-Id: I540f86cf11746faefc25bc74319512eba6d0d783
Hugo Benichi [Thu, 25 May 2017 01:18:45 +0000 (01:18 +0000)]
Merge "NsdServiceInfo: move test to tests/net" am:
48859e01d5 am:
1b0f4bf606 am:
e8c2700519
am:
41687a201b
Change-Id: I11af75ab8ebc4081cc90d29b83d8a1742f00a3ab
Hugo Benichi [Thu, 25 May 2017 01:12:51 +0000 (01:12 +0000)]
Merge "NsdServiceInfo: move test to tests/net" am:
48859e01d5 am:
1b0f4bf606
am:
e8c2700519
Change-Id: I44cae417fcddad72c13938b6fb751de6ed784046
Hugo Benichi [Thu, 25 May 2017 01:06:48 +0000 (01:06 +0000)]
Merge "NsdServiceInfo: move test to tests/net" am:
48859e01d5
am:
1b0f4bf606
Change-Id: I2c27790f23d1ecc7b42dbbe28313f0533a1bab53
Hugo Benichi [Thu, 25 May 2017 01:01:15 +0000 (01:01 +0000)]
Merge "NsdServiceInfo: move test to tests/net"
am:
48859e01d5
Change-Id: I3e864d744b956eff62512419018dd7cd5f692333
Hugo Benichi [Thu, 25 May 2017 00:50:24 +0000 (00:50 +0000)]
Merge "NsdServiceInfo: move test to tests/net"
Kevin Chyn [Fri, 28 Apr 2017 19:18:19 +0000 (12:18 -0700)]
enable FP auth when assistant is showing and device is locked
Bug:
37875884
Test: manual
Change-Id: I4f310f71a50187735c1430b462291b2f57f54324
Joel Scherpelz [Thu, 25 May 2017 00:32:08 +0000 (00:32 +0000)]
Merge "Ignore flow label when comparing RAs in APF" am:
81fda77884 am:
6ccdb3fe19 am:
ef0bd781b1
am:
5bb63befb8
Change-Id: I4669b0502a2da05fc7d6d23dda0fe57a69a412d6
Makoto Onuki [Wed, 24 May 2017 21:58:25 +0000 (14:58 -0700)]
Working around bugreport crash issues
Overall we need more synchronization, but I'm taking a safe approach
here for oc-dev for now.
Bug:
62043115
Test: adb shell am instrument -w com.android.shell.tests
Change-Id: I0e22c5160cb96ce51dc1775237f01b7bf5c97a17
Felipe Leme [Thu, 25 May 2017 00:22:33 +0000 (00:22 +0000)]
Merge "Don't WTF when assist structure is missing." into oc-dev am:
9fe48b43ba
am:
0dc16ddee9
Change-Id: I60f2b830c7e93af0d6df148812d7e88309843560
Joel Scherpelz [Thu, 25 May 2017 00:18:44 +0000 (00:18 +0000)]
Merge "Ignore flow label when comparing RAs in APF" am:
81fda77884 am:
6ccdb3fe19
am:
ef0bd781b1
Change-Id: I53c2a493946ecc4e5617bcd3f5e64ff0b82fedf2
Felipe Leme [Thu, 25 May 2017 00:13:10 +0000 (00:13 +0000)]
Merge "Don't WTF when assist structure is missing." into oc-dev
am:
9fe48b43ba
Change-Id: Ibe8fccf20f17327ce86635762accd87f4ccc8b08
Joel Scherpelz [Thu, 25 May 2017 00:12:22 +0000 (00:12 +0000)]
Merge "Ignore flow label when comparing RAs in APF" am:
81fda77884
am:
6ccdb3fe19
Change-Id: I8a463109f896fe91f391c26f4b341e0e0c417d8a
TreeHugger Robot [Thu, 25 May 2017 00:05:49 +0000 (00:05 +0000)]
Merge "Don't WTF when assist structure is missing." into oc-dev
Joel Scherpelz [Thu, 25 May 2017 00:04:12 +0000 (00:04 +0000)]
Merge "Ignore flow label when comparing RAs in APF"
am:
81fda77884
Change-Id: Id1a51e03e5065cabb4645d1e05f5e22ab4e98c0a
Matthew Ng [Wed, 24 May 2017 23:59:36 +0000 (23:59 +0000)]
Merge "Update the app window's thumbnail layer after starting window is removed" into oc-dev am:
052ff89f65
am:
018ee76ef9
Change-Id: Ibe6c44350582db4e777ef1af44577d6c6dc91a9d
Kevin Chyn [Wed, 24 May 2017 23:56:56 +0000 (16:56 -0700)]
Revert fix for FingerprintManager leak
Bug:
38509779
Bug:
32295793
Setting to null causes problem seen in b/
38509779
Using weakreference will cause problems if the application
declares AuthenticationClient as a weak reference as well and would
very likely break a lot of existing apps.
Test: manual
Change-Id: Iedbdd76f3a402b766ce8a799bf76324d1164a0ec
Joel Scherpelz [Wed, 24 May 2017 23:54:21 +0000 (23:54 +0000)]
Merge "Ignore flow label when comparing RAs in APF"
Felipe Leme [Wed, 24 May 2017 20:16:31 +0000 (13:16 -0700)]
Autofill UI should still show when dataset authentication is cancelled.
Test: manual verification
Test: existing CtsAutoFillServiceTestCases pass
Test: LoginActivityTest.testDatasetAuthTwoFieldsUserCancelsFirstAttempt
Fixes:
38427468
Change-Id: If8785ad8fda1408a5dee66c53f7dcb4c85d78262
Matthew Ng [Wed, 24 May 2017 23:48:45 +0000 (23:48 +0000)]
Merge "Update the app window's thumbnail layer after starting window is removed" into oc-dev
am:
052ff89f65
Change-Id: I7a622e8e4fee766619828831315d11db1ace6ec9
TreeHugger Robot [Wed, 24 May 2017 23:44:10 +0000 (23:44 +0000)]
Merge "Update the app window's thumbnail layer after starting window is removed" into oc-dev
Andrew Solovay [Mon, 22 May 2017 22:36:11 +0000 (15:36 -0700)]
docs: Clarifying code snippet for View.autoFill()
Per bug, updating code snippet to clarify that it's an example of an
implementation of the method. Oscar & Felipe, please check that I did
it right!
Also fixed a couple of HTML syntax errors while I had the file open
(badly formatted escape-characters that Chrome figured out, but other
browsers might choke on) and a spelling error.
Revised Javadoc is staged to:
http://go/dac-stage/reference/android/view/View.html#autofill(android.view.autofill.AutofillValue)
Test: make ds-docs
Bug:
38347106
Change-Id: I587a66c53fd5ebeeb6108529723d2d7a74c61cf7
Tyler Gunn [Wed, 24 May 2017 23:09:07 +0000 (23:09 +0000)]
Merge "Add ability to dump events in a timeline view." am:
255a171c5d am:
3b27d69612 am:
a1c225936a
am:
bfea5cdb78
Change-Id: Ib1a0fa4221890b02937bc44d3293a65b5508d12f
Tyler Gunn [Wed, 24 May 2017 23:01:22 +0000 (23:01 +0000)]
Merge "Add ability to dump events in a timeline view." am:
255a171c5d am:
3b27d69612
am:
a1c225936a
Change-Id: I34c3327e675d1948ae6074337cce800919e03030
Tyler Gunn [Wed, 24 May 2017 22:52:40 +0000 (22:52 +0000)]
Merge "Add ability to dump events in a timeline view." am:
255a171c5d
am:
3b27d69612
Change-Id: I5363916199a33e795fcfb8497815687cda91f6ef
Tyler Gunn [Wed, 24 May 2017 22:45:55 +0000 (22:45 +0000)]
Merge "Add ability to dump events in a timeline view."
am:
255a171c5d
Change-Id: I7bb01946685f4e9c5b60fd0e8e2be4b071fd1a6f
Tyler Gunn [Wed, 24 May 2017 22:36:41 +0000 (22:36 +0000)]
Merge "Add ability to dump events in a timeline view."
Jason Monk [Wed, 24 May 2017 22:20:54 +0000 (22:20 +0000)]
Merge "Fix QS tiles not rippling" into oc-dev am:
b8e5742f5b
am:
8edc7a7ea5
Change-Id: I21ebacf2a8ae985514763198fd5a01f038790be7
Adrian Roos [Wed, 24 May 2017 22:18:43 +0000 (22:18 +0000)]
Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev am:
838e365581
am:
e90d58ed09
Change-Id: I93ab6feaf0b4fd36fa80fdc48878a5c71df70e26
John Reck [Tue, 23 May 2017 21:45:22 +0000 (14:45 -0700)]
Creating HW bitmaps from RenderNode
Allows creating a HW Bitmap from the drawing
commands of a RenderNode.
Bug:
38507414
Bug:
37698012
Test: Sample in HwAccelerationTest
Change-Id: I57c60b2c8bf5194f4412ad4b7f1c1f35e2e4c757
Nathan Harold [Wed, 24 May 2017 22:09:57 +0000 (22:09 +0000)]
Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev am:
72cdc9cdae
am:
6bebfa708d
Change-Id: I5cb366480533afdb767144d760198d8ddfaa3dbd
Jason Monk [Wed, 24 May 2017 22:05:29 +0000 (22:05 +0000)]
Merge "Fix QS tiles not rippling" into oc-dev
am:
b8e5742f5b
Change-Id: I05ff98435f88ea489a557013fc53a8cfe12304f5
Adrian Roos [Wed, 24 May 2017 22:01:34 +0000 (22:01 +0000)]
Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev
am:
838e365581
Change-Id: I7140eb9253c84dc35a5f3bf62576e71e4828c6c5
Michael Schwartz [Wed, 24 May 2017 21:58:44 +0000 (21:58 +0000)]
Merge "Check VintfObject compatibility on boot" into oc-dev am:
4e962321ad
am:
ab0605ceb5
Change-Id: Id4c700d6d5daf0ae08369b4c7263b7112dc3b609
Nathan Harold [Wed, 24 May 2017 21:56:36 +0000 (21:56 +0000)]
Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev
am:
72cdc9cdae
Change-Id: I7c6360ee53e929e0e03dcd1e1a767d98af94f620
Felipe Leme [Wed, 24 May 2017 21:53:58 +0000 (21:53 +0000)]
Merge "Fixed assertions on bugreport share notification." into oc-dev am:
39b375c9db
am:
6fbbedb6be
Change-Id: I36b5fcffeb58e83236553137f92bcc64104c0381
Ruthwar Kumar Ambeer [Wed, 24 May 2017 21:51:35 +0000 (21:51 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance" into oc-dev am:
ef98275635 -s ours
am:
51a27d28b9 -s ours
Change-Id: I8515f878b22a27a1b7c5f2c0eee5ee215e19bf0d
Michael Schwartz [Wed, 24 May 2017 21:50:47 +0000 (21:50 +0000)]
Merge "Check VintfObject compatibility on boot" into oc-dev
am:
4e962321ad
Change-Id: Ie3f55facc983e421432549440a81c1978c3e9482
TreeHugger Robot [Wed, 24 May 2017 21:50:15 +0000 (21:50 +0000)]
Merge "Fix QS tiles not rippling" into oc-dev
OSDN Git Service
