OSDN Git Service
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
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"
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
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
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
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
Felipe Leme [Wed, 24 May 2017 21:46:30 +0000 (21:46 +0000)]
Merge "Fixed assertions on bugreport share notification." into oc-dev
am:
39b375c9db
Change-Id: I90ec303a24376b63b59dbc0035f56058c062a2af
Ruthwar Kumar Ambeer [Wed, 24 May 2017 21:39:44 +0000 (21:39 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance" into oc-dev
am:
ef98275635 -s ours
Change-Id: Icf1ff0d9ed2ee86728960f3349762275020f8f10
Tenghui Zhu [Wed, 24 May 2017 21:36:45 +0000 (21:36 +0000)]
Merge "Add documentation about 0 scale matrix to Shader" into oc-dev am:
52ca75011b
am:
e7bc3d70b5
Change-Id: I1f659529a22072d329af949bedb3636400f0fde3
TreeHugger Robot [Wed, 24 May 2017 21:36:32 +0000 (21:36 +0000)]
Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev
Nathan Harold [Wed, 24 May 2017 21:36:15 +0000 (21:36 +0000)]
Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev
Michael Schwartz [Wed, 24 May 2017 21:34:03 +0000 (21:34 +0000)]
Merge "Check VintfObject compatibility on boot" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 21:32:56 +0000 (21:32 +0000)]
Merge "Fixed assertions on bugreport share notification." into oc-dev
TreeHugger Robot [Wed, 24 May 2017 21:28:05 +0000 (21:28 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance" into oc-dev
Sergey Vasilinets [Wed, 24 May 2017 21:27:39 +0000 (21:27 +0000)]
Merge "Correctly save retained fragments in the backstack" into oc-dev am:
ce8a4b89c8
am:
67cbbfe092
Change-Id: I8821126025eebc553d82c80018a8d2aefe57bf57
Tenghui Zhu [Wed, 24 May 2017 21:17:36 +0000 (21:17 +0000)]
Merge "Add documentation about 0 scale matrix to Shader" into oc-dev
am:
52ca75011b
Change-Id: Ied29af1118f1f5db343c3e3d7218d757b67f61a6
Adrian Roos [Wed, 24 May 2017 21:15:16 +0000 (21:15 +0000)]
Merge "Keyguard: Update clock size" into oc-dev am:
6441e1064c
am:
2105d8f1a7
Change-Id: I2f479aaf3ff68c797469ad3a35a9c4c6f09542ca
Adrian Roos [Wed, 24 May 2017 21:13:13 +0000 (21:13 +0000)]
Merge "Keyguard: Remove all caps from keyguard status view" into oc-dev am:
246a2c90ac
am:
90871e5ba5
Change-Id: Iaa46cc13a0196168581103d80dc804cbeb40310c
Sergey Vasilinets [Wed, 24 May 2017 21:12:12 +0000 (21:12 +0000)]
Merge "Correctly save retained fragments in the backstack" into oc-dev
am:
ce8a4b89c8
Change-Id: I755b0f38c907d1ae7bf12df67f4b10590a9016bf
Abodunrinwa Toki [Wed, 24 May 2017 21:11:02 +0000 (21:11 +0000)]
Merge "Regression test: Menu item title updates." into oc-dev am:
834f257f22
am:
c687b62ce0
Change-Id: I811f5ce2af5f61b8be8dfbe5a875ec82e2adc3dc
Tenghui Zhu [Wed, 24 May 2017 21:06:52 +0000 (21:06 +0000)]
Merge "Add documentation about 0 scale matrix to Shader" into oc-dev
Adrian Roos [Wed, 24 May 2017 21:05:57 +0000 (21:05 +0000)]
Merge "Keyguard: Update clock size" into oc-dev
am:
6441e1064c
Change-Id: I56dae82a5fdefcd088bb0b8ec8eb3cd8a89f7bf7
Sergey Vasilinets [Wed, 24 May 2017 21:05:34 +0000 (21:05 +0000)]
Merge "Correctly save retained fragments in the backstack" into oc-dev
Selim Cinek [Wed, 24 May 2017 21:04:38 +0000 (21:04 +0000)]
Merge "Fixed that pinned huns could become clipped" into oc-dev am:
20e1c8c0f5
am:
e249544b1a
Change-Id: Ibd37dee4154d9a478de8c0c6ee9907c2b64fc9c9
Adrian Roos [Wed, 24 May 2017 21:01:46 +0000 (21:01 +0000)]
Merge "Keyguard: Remove all caps from keyguard status view" into oc-dev
am:
246a2c90ac
Change-Id: I36f60a7e64b38e7abdbb59b629997f4214db9b3f
Adrian Roos [Wed, 24 May 2017 21:01:39 +0000 (21:01 +0000)]
Merge "Keyguard: Update clock size" into oc-dev
Todd Kennedy [Wed, 24 May 2017 21:01:01 +0000 (21:01 +0000)]
Merge "System installed launcher can see instant apps" into oc-dev am:
1de10d6602
am:
4cdc26746e
Change-Id: I2a66bfa001ea03205535bc0337f720d869fa9132
Selim Cinek [Wed, 24 May 2017 18:08:55 +0000 (11:08 -0700)]
Fixed an issue where groups could stay userlocked
It also fixes an issue where the reinflation wasn't
working properly.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
Merged-In: If359256a3ac0c574260b5ff5af3fc2042e1dce9a
Change-Id: If359256a3ac0c574260b5ff5af3fc2042e1dce9a
Fixes:
36469584
Abodunrinwa Toki [Wed, 24 May 2017 20:59:39 +0000 (20:59 +0000)]
Merge "Regression test: Menu item title updates." into oc-dev
am:
834f257f22
Change-Id: Ia2a226edb48340774a7d9c79b6a7f113241a3df0
Selim Cinek [Wed, 24 May 2017 18:08:55 +0000 (11:08 -0700)]
Fixed an issue where groups could stay userlocked
It also fixes an issue where the reinflation wasn't
working properly.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
Change-Id: If359256a3ac0c574260b5ff5af3fc2042e1dce9a
Fixes:
36469584
Selim Cinek [Wed, 24 May 2017 20:52:13 +0000 (20:52 +0000)]
Merge "Fixed that pinned huns could become clipped" into oc-dev
am:
20e1c8c0f5
Change-Id: Ic4f94667f2349be270f5cfff50e77d66e9b8f4ce
TreeHugger Robot [Wed, 24 May 2017 20:50:57 +0000 (20:50 +0000)]
Merge "Keyguard: Remove all caps from keyguard status view" into oc-dev
Todd Kennedy [Wed, 24 May 2017 20:49:59 +0000 (20:49 +0000)]
Merge "System installed launcher can see instant apps" into oc-dev
am:
1de10d6602
Change-Id: I70d707c25ed793bd2ad8e58f3558d2a4d0b6e980
Abodunrinwa Toki [Wed, 24 May 2017 20:48:02 +0000 (20:48 +0000)]
Merge "Regression test: Menu item title updates." into oc-dev
Brad Ebinger [Wed, 24 May 2017 20:46:26 +0000 (20:46 +0000)]
Merge "Support RRO for emergency number conversion map" am:
671680e504 am:
8498a6cffd am:
ddd73513e6
am:
8187781e37
Change-Id: I80f11d2c105eeeb08f37f9b6083b9709cae5453f
Selim Cinek [Wed, 24 May 2017 20:44:56 +0000 (20:44 +0000)]
Merge "Fixed that pinned huns could become clipped" into oc-dev
Roshan Pius [Wed, 24 May 2017 20:40:47 +0000 (20:40 +0000)]
Merge "WifiMetrics: Add metrics for HAL/wificond crashes" into oc-dev am:
131eaa7865
am:
6bc34f3c1e
Change-Id: Ide1d8d479467bd75fcfe5e611b3f849e5cd73887
Brad Ebinger [Wed, 24 May 2017 20:39:46 +0000 (20:39 +0000)]
Merge "Support RRO for emergency number conversion map" am:
671680e504 am:
8498a6cffd
am:
ddd73513e6
Change-Id: Id41d327b54fdf95c86a4f6e8d3727b79b98a2d5b
TreeHugger Robot [Wed, 24 May 2017 20:38:51 +0000 (20:38 +0000)]
Merge "System installed launcher can see instant apps" into oc-dev
Christopher Ferris [Wed, 24 May 2017 20:36:22 +0000 (20:36 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names" into oc-dev am:
8e3b379394
am:
1ef9fe7c52
Change-Id: Ie952cb856b2d0149cd276604262ccb3b060e98bc
Brad Ebinger [Wed, 24 May 2017 20:33:26 +0000 (20:33 +0000)]
Merge "Support RRO for emergency number conversion map" am:
671680e504
am:
8498a6cffd
Change-Id: I4b90f44a5ccf42ab1586ae8867f63c0a2e362d97
Roshan Pius [Wed, 24 May 2017 20:31:21 +0000 (20:31 +0000)]
Merge "WifiMetrics: Add metrics for HAL/wificond crashes" into oc-dev
am:
131eaa7865
Change-Id: I954fd52c87f3b447469af898ca77dde2a4707346
Christopher Ferris [Wed, 24 May 2017 20:28:24 +0000 (20:28 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names" into oc-dev
am:
8e3b379394
Change-Id: I24f8e5f7f2259feb6564390f24303991f580a76d
Selim Cinek [Wed, 24 May 2017 20:28:22 +0000 (20:28 +0000)]
Merge "Fixed an issue where the panel could be stuck expanding" into oc-dev am:
5d8e4c4773
am:
087b208a25
Change-Id: I315f3ce8d5a92fbacb737d8a631f17e30074e9db
Brad Ebinger [Wed, 24 May 2017 20:27:48 +0000 (20:27 +0000)]
Merge "Support RRO for emergency number conversion map"
am:
671680e504
Change-Id: I74cc3235e07116f2f1e03f24f5ea51b73a86af82
Selim Cinek [Wed, 24 May 2017 20:21:08 +0000 (20:21 +0000)]
Merge "Fixed an issue where the panel could be stuck expanding" into oc-dev
am:
5d8e4c4773
Change-Id: I1c1c0693131e9075fe2830936cd6ee3e3081912a
TreeHugger Robot [Wed, 24 May 2017 20:20:58 +0000 (20:20 +0000)]
Merge "WifiMetrics: Add metrics for HAL/wificond crashes" into oc-dev
Christopher Ferris [Wed, 24 May 2017 20:20:38 +0000 (20:20 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names" into oc-dev
Brad Ebinger [Wed, 24 May 2017 20:19:29 +0000 (20:19 +0000)]
Merge "Support RRO for emergency number conversion map"
Selim Cinek [Wed, 24 May 2017 20:13:18 +0000 (20:13 +0000)]
Merge "Fixed an issue where the panel could be stuck expanding" into oc-dev
Adam Powell [Wed, 24 May 2017 20:09:20 +0000 (20:09 +0000)]
Merge "Disable state save/restore for inflated date/time picker views" into oc-dev am:
7f517b2fe6
am:
a59d91d541
Change-Id: I853e8b3c22f51a5f84ada0df9621a6c469e08124
Adam Powell [Wed, 24 May 2017 20:01:08 +0000 (20:01 +0000)]
Merge "Disable state save/restore for inflated date/time picker views" into oc-dev
am:
7f517b2fe6
Change-Id: Ifb028e4be2e1657a5a1e7e39b23a981bc21d26f5