OSDN Git Service
Julia Reynolds [Mon, 26 Jun 2017 15:35:33 +0000 (11:35 -0400)]
Only try to autogroup if group info changes
Test: runtest systemui-notification
Change-Id: I7ddf622530ee4c452353bea6751b613354917a1b
Fixes:
62788068
Sooraj Sasindran [Mon, 26 Jun 2017 17:10:58 +0000 (17:10 +0000)]
Merge "Enable 5 bar signal strength for VZW" into oc-dr1-dev am:
b7650d2233
am:
dd807e6ba6
Change-Id: I2eaa7e9aa23baedf5b7075d38d29444771bd2933
Jeff Sharkey [Mon, 26 Jun 2017 17:02:41 +0000 (11:02 -0600)]
Fix the red build.
Change-Id: If035d6939f5a465b4b579b590f8f2b5b532e0951
Sooraj Sasindran [Mon, 26 Jun 2017 17:02:16 +0000 (17:02 +0000)]
Merge "Enable 5 bar signal strength for VZW" into oc-dr1-dev
am:
b7650d2233
Change-Id: I156eb301a9fc47f3fb53eaf0efc831ea39cce84a
Sooraj Sasindran [Mon, 26 Jun 2017 16:50:20 +0000 (16:50 +0000)]
Merge "Enable 5 bar signal strength for VZW" into oc-dr1-dev
TreeHugger Robot [Mon, 26 Jun 2017 16:30:29 +0000 (16:30 +0000)]
Merge "Limit when a ranking reconsidering can alert"
Pankaj Kanwar [Mon, 26 Jun 2017 16:10:40 +0000 (16:10 +0000)]
Merge "Carrier Config changes to support IMSI encryption." am:
1caaa514c9 am:
e26191a81c am:
01741762d8
am:
70c1f55927
Change-Id: Ib913d1897154aec9693ced4f8a95fd8fe57bc424
Pankaj Kanwar [Mon, 26 Jun 2017 16:03:06 +0000 (16:03 +0000)]
Merge "Carrier Config changes to support IMSI encryption." am:
1caaa514c9 am:
e26191a81c
am:
01741762d8
Change-Id: I385f7ce854a52533251d3777e227aeaf695bb7db
Pankaj Kanwar [Mon, 26 Jun 2017 15:55:46 +0000 (15:55 +0000)]
Merge "Carrier Config changes to support IMSI encryption." am:
1caaa514c9
am:
e26191a81c
Change-Id: I777010e6fea82f237ddf224525739a5687f13a2c
Pankaj Kanwar [Mon, 26 Jun 2017 15:48:03 +0000 (15:48 +0000)]
Merge "Carrier Config changes to support IMSI encryption."
am:
1caaa514c9
Change-Id: Ia9c4d93e8ababf87a0d6027a4322e73111651844
Pankaj Kanwar [Mon, 26 Jun 2017 15:36:43 +0000 (15:36 +0000)]
Merge "Carrier Config changes to support IMSI encryption."
Neil Fuller [Mon, 26 Jun 2017 15:16:35 +0000 (15:16 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method" am:
fe0b43cb1e am:
6b5d71f7e5 am:
9e28f78763
am:
58bcfb7d17
Change-Id: I1062f73e7a6af5754beda6e5c5a342d0de6ffac7
Neil Fuller [Mon, 26 Jun 2017 15:09:04 +0000 (15:09 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method" am:
fe0b43cb1e am:
6b5d71f7e5
am:
9e28f78763
Change-Id: Ia4b5e3da52fabae83defcca5ab171ee46dfc12bb
Neil Fuller [Mon, 26 Jun 2017 15:01:37 +0000 (15:01 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method" am:
fe0b43cb1e
am:
6b5d71f7e5
Change-Id: Ib4d97f72a9fa936beb47267c9e9a888e306ed0e5
Paul Duffin [Mon, 26 Jun 2017 14:57:34 +0000 (14:57 +0000)]
Merge "Remove a.t.TestCase" am:
3c5ab7d324 am:
930ab689f0 am:
143f5d652c
am:
8d33b10edb
Change-Id: I372ea1e9456a303903bb57929129cc3f922cb8d9
Neil Fuller [Mon, 26 Jun 2017 14:53:58 +0000 (14:53 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method"
am:
fe0b43cb1e
Change-Id: I8c263ce15bf29b8a14c862d9acae377ba9be77c3
Paul Duffin [Mon, 26 Jun 2017 14:50:38 +0000 (14:50 +0000)]
Merge "Remove a.t.TestCase" am:
3c5ab7d324 am:
930ab689f0
am:
143f5d652c
Change-Id: I1b2212164ab566f3619cdbe307ff9ee600242424
Paul Duffin [Mon, 26 Jun 2017 14:43:13 +0000 (14:43 +0000)]
Merge "Remove a.t.TestCase" am:
3c5ab7d324
am:
930ab689f0
Change-Id: I0d61b4e26c9551d177b5bb7bbdaab25885976c0d
Treehugger Robot [Mon, 26 Jun 2017 14:40:28 +0000 (14:40 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method"
Paul Duffin [Mon, 26 Jun 2017 14:35:01 +0000 (14:35 +0000)]
Merge "Remove a.t.TestCase"
am:
3c5ab7d324
Change-Id: Id2f80c8bb95e3e64207d937929e027c49e602a72
TreeHugger Robot [Mon, 26 Jun 2017 14:28:41 +0000 (14:28 +0000)]
Merge "Allow shell notification listener access toggling"
Paul Duffin [Mon, 26 Jun 2017 14:24:29 +0000 (14:24 +0000)]
Merge "Remove a.t.TestCase"
Paul Duffin [Mon, 26 Jun 2017 13:29:23 +0000 (13:29 +0000)]
Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp am:
50826c5f2e
am:
4f9d89a380
Change-Id: I24b978bb63875ed7e1af7041f8ecbbfc482e0614
Paul Duffin [Mon, 26 Jun 2017 13:21:28 +0000 (13:21 +0000)]
Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp
am:
50826c5f2e
Change-Id: Ica9b9b478b670ec5467732a09cf123dd63780c97
Paul Duffin [Mon, 26 Jun 2017 13:15:03 +0000 (13:15 +0000)]
Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp
Hugo Benichi [Mon, 26 Jun 2017 12:19:52 +0000 (12:19 +0000)]
Merge "IpManager: always log immediate provisioning errors" am:
98f2decdad am:
2d2f66d277 am:
834cf8d664
am:
99979253dd
Change-Id: I428f2e7b77279eff017551c771f0e178e950b1d2
Hugo Benichi [Mon, 26 Jun 2017 12:12:20 +0000 (12:12 +0000)]
Merge "IpManager: always log immediate provisioning errors" am:
98f2decdad am:
2d2f66d277
am:
834cf8d664
Change-Id: I39a5752827b02e9ebefa97b831b38da2eed4ca12
Hugo Benichi [Mon, 26 Jun 2017 12:07:12 +0000 (12:07 +0000)]
Merge "IpManager: always log immediate provisioning errors" am:
98f2decdad
am:
2d2f66d277
Change-Id: If1e885c13ce7ec1f480add63940bf9bc929d5072
Hugo Benichi [Mon, 26 Jun 2017 11:57:17 +0000 (11:57 +0000)]
Merge "IpManager: always log immediate provisioning errors"
am:
98f2decdad
Change-Id: I6d745a4d6e9b932c16fe54fdabe191962389882d
Paul Duffin [Mon, 26 Jun 2017 11:49:54 +0000 (11:49 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter" am:
1ed43cafb6 am:
4601ebf945 am:
1fee4dcd5d
am:
88f06cba46
Change-Id: I4c8b5ff724ccb73a681ba5bef86ebe5a502383be
Hugo Benichi [Mon, 26 Jun 2017 11:43:11 +0000 (11:43 +0000)]
Merge "IpManager: always log immediate provisioning errors"
Paul Duffin [Mon, 26 Jun 2017 11:42:54 +0000 (11:42 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter" am:
1ed43cafb6 am:
4601ebf945
am:
1fee4dcd5d
Change-Id: I6362ff0e8e76efd4d7b8c326f77b282740d01e03
Paul Duffin [Mon, 26 Jun 2017 11:35:00 +0000 (11:35 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter" am:
1ed43cafb6
am:
4601ebf945
Change-Id: Icf7b8d1f5a3e0d18cd9a096a8171d6dab98b5992
Paul Duffin [Mon, 26 Jun 2017 11:27:36 +0000 (11:27 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter"
am:
1ed43cafb6
Change-Id: If185962713352c4ce4e0ff27bc333e5eededde7f
Paul Duffin [Mon, 26 Jun 2017 11:21:19 +0000 (11:21 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter"
Neil Fuller [Thu, 22 Jun 2017 13:10:29 +0000 (14:10 +0100)]
Avoid use of TimeZoneDistro.equals() method
The TimeZoneDistro method is going away.
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above
Test: Manual
Bug:
31008728
Change-Id: Id90cf7ce534b888bf6df1bf1dc9d497608dcdbe9
Adam Vartanian [Mon, 26 Jun 2017 10:18:46 +0000 (10:18 +0000)]
Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp am:
c584a2596e
am:
59410a96ed -s ours
Change-Id: I883b87ddb6f5d8fb9ffdb31cab12fd4429ececd6
Adam Vartanian [Mon, 26 Jun 2017 10:12:56 +0000 (10:12 +0000)]
Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp
am:
c584a2596e
Change-Id: I0eff66034ec46c33dd733cffabeacae1ee53db35
Adam Vartanian [Mon, 26 Jun 2017 10:08:23 +0000 (10:08 +0000)]
Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp
Paul Duffin [Mon, 26 Jun 2017 09:50:09 +0000 (09:50 +0000)]
Merge "Clean up TestCaseUtil" am:
43851d01d8 am:
e38d503394 am:
b5b6e7cf45
am:
ad654a3af5
Change-Id: Idd36689c3a90728ee543be0ffa7457fe79b66ba3
Adam Vartanian [Mon, 26 Jun 2017 09:43:38 +0000 (10:43 +0100)]
Add libcrypto to shared libraries of core/jni
This was added to master in ag/
2447995 but not to aosp in aosp/420427,
which resulted in a failure in this branch.
Bug:
62991913
Test: make
Change-Id: Iefa0254c91e83da737a160f851c97ab3e6a7b0f8
Merged-In: I547bb838befa743d72d356c186ff3cd355736589
Paul Duffin [Mon, 26 Jun 2017 09:41:44 +0000 (09:41 +0000)]
Merge "Clean up TestCaseUtil" am:
43851d01d8 am:
e38d503394
am:
b5b6e7cf45
Change-Id: I98265e973df1bf7ac28b7f79f6ccd0a865762304
Paul Duffin [Mon, 26 Jun 2017 09:33:23 +0000 (09:33 +0000)]
Merge "Clean up TestCaseUtil" am:
43851d01d8
am:
e38d503394
Change-Id: I62a80b405d05ec7b4da050bd6b01df4c965d6187
Paul Duffin [Mon, 26 Jun 2017 09:24:39 +0000 (09:24 +0000)]
Merge "Clean up TestCaseUtil"
am:
43851d01d8
Change-Id: I5a56102b06053eb92583457105adf7e88bdb5502
Paul Duffin [Mon, 26 Jun 2017 09:15:05 +0000 (09:15 +0000)]
Merge "Clean up TestCaseUtil"
Richard Uhler [Mon, 26 Jun 2017 09:09:05 +0000 (09:09 +0000)]
Fix bug in reporting SwapPss in dumpsys meminfo. am:
a178205e8b
am:
a18500b508
Change-Id: Id887d387ea36f68ec6c223b89a403cae023c5bfd
Richard Uhler [Mon, 26 Jun 2017 09:01:32 +0000 (09:01 +0000)]
Fix bug in reporting SwapPss in dumpsys meminfo.
am:
a178205e8b
Change-Id: I49c805c6fab673008b18a5a8deb256ec2a5fb970
TreeHugger Robot [Mon, 26 Jun 2017 06:36:25 +0000 (06:36 +0000)]
Merge "Fix bug in reporting SwapPss in dumpsys meminfo."
Richard Uhler [Fri, 23 Jun 2017 15:54:25 +0000 (16:54 +0100)]
Fix bug in reporting SwapPss in dumpsys meminfo.
Bug:
29875093
Test: Run dumpsys meminfo -a, verify SwapPss adds up and is non-zero
for dalvik and native.
Change-Id: I79d0b6a59bf5f4e73f75f0b9540ec0fcc9e23b02
pkanwar [Wed, 31 May 2017 20:10:03 +0000 (13:10 -0700)]
Carrier Config changes to support IMSI encryption.
Adding 2 config parameters to CarrierConfigManager:
1. imsi_key_download_url.
2. imsi_key_expiration_days_time.
BUG:
35606429
Test: manual
Change-Id: I191dd0db5fa84a57faea88cb59c2c0b2604064b2
Hugo Benichi [Thu, 22 Jun 2017 06:19:35 +0000 (15:19 +0900)]
IpManager: always log immediate provisioning errors
And also migrate remaining Log.e usage to logError.
Bug:
62716267
Test: built and flashed
Change-Id: I61a6cec081d2bc0fe3d73e46fd52f1a42684e58c
Jaewan Kim [Sun, 25 Jun 2017 01:42:03 +0000 (01:42 +0000)]
Merge "Consider double tap of the play/pause as the next track" into oc-dr1-dev am:
f05929af73
am:
db7927c21e
Change-Id: I69a6f48e46bcbd7ed03057ce0c18002f6ecdd576
Jaewan Kim [Sun, 25 Jun 2017 01:33:31 +0000 (01:33 +0000)]
Merge "Consider double tap of the play/pause as the next track" into oc-dr1-dev
am:
f05929af73
Change-Id: I6cbcf4485db688a47135b3fe471a14fa78492cea
TreeHugger Robot [Sun, 25 Jun 2017 01:26:41 +0000 (01:26 +0000)]
Merge "Consider double tap of the play/pause as the next track" into oc-dr1-dev
Hugo Benichi [Sat, 24 Jun 2017 12:51:12 +0000 (12:51 +0000)]
Merge "Relax SharedLogTest asserts" am:
91464bfe68 am:
541079e0d7 am:
a29861b0c9
am:
e504d0be0b
Change-Id: Idc7e4d749a8837f046cee4651ef07af655221771
Hugo Benichi [Sat, 24 Jun 2017 12:44:45 +0000 (12:44 +0000)]
Merge "Relax SharedLogTest asserts" am:
91464bfe68 am:
541079e0d7
am:
a29861b0c9
Change-Id: I53d99edee6729b753707db251e252297b927d2a7
Hugo Benichi [Sat, 24 Jun 2017 12:37:45 +0000 (12:37 +0000)]
Merge "Relax SharedLogTest asserts" am:
91464bfe68
am:
541079e0d7
Change-Id: I7a584c155915196c9b6b1a856141a3d9ab5699db
Hugo Benichi [Sat, 24 Jun 2017 12:29:28 +0000 (12:29 +0000)]
Merge "Relax SharedLogTest asserts"
am:
91464bfe68
Change-Id: Ibcf2ee24ac33a23fb3813dc6045db154644e1a3d
Hugo Benichi [Sat, 24 Jun 2017 12:19:55 +0000 (12:19 +0000)]
Merge "Relax SharedLogTest asserts"
Gustav Sennton [Sat, 24 Jun 2017 10:33:34 +0000 (10:33 +0000)]
Merge "Move WebView loader from frameworks/webview/ to frameworks/base/."
Phil Weaver [Sat, 24 Jun 2017 05:29:37 +0000 (05:29 +0000)]
Merge "Protect a11y against multi-threaded UIs" into oc-dr1-dev am:
10a41f9b12
am:
da3774ea41
Change-Id: I8463ccc699ec283dfcc2781946e53836f9177d46
Daniel Sandler [Sat, 24 Jun 2017 05:25:19 +0000 (05:25 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev am:
7fce51594e am:
1ccaf797c4
am:
4e403bc8e7
Change-Id: I0b12e8325c3824eb4ebef7eba3a403533c1f5428
Eric Laurent [Sat, 24 Jun 2017 05:23:16 +0000 (05:23 +0000)]
Merge "AudioSystem: Add missing DEVICE_USB_HEADSET to DEVICE_USB_ALL" into oc-dr1-dev am:
e2e01f7795
am:
1c22f1d77f
Change-Id: Ifa0ac27c5d025527ce3ed95032668910febc0a90
Jean-Michel Trivi [Sat, 24 Jun 2017 05:20:52 +0000 (05:20 +0000)]
Merge "Total Silence vs VoIP" into oc-dr1-dev am:
92e1d0ab44
am:
44e6126079
Change-Id: Id9096436fc8d10f672777b31e40dd8e121faa418
Wale Ogunwale [Sat, 24 Jun 2017 05:18:49 +0000 (05:18 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev am:
0b138595de am:
9d30c653d3
am:
1450679152
Change-Id: Ibe8086299dd7e0652b8ec8694c1f4e5ad53d4dc6
Phil Weaver [Sat, 24 Jun 2017 05:16:33 +0000 (05:16 +0000)]
Merge "Protect a11y against multi-threaded UIs" into oc-dr1-dev
am:
10a41f9b12
Change-Id: I24be95a742543ebb89c51a177af8875ce2dc7b43
Selim Cinek [Sat, 24 Jun 2017 05:14:27 +0000 (05:14 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev am:
9bf5c0c3e1 am:
ff122e750c
am:
e7cf8bc21d
Change-Id: I08e2f6d66ccd51b846bb3a2f7c4dfb28e9f9662c
Daniel Sandler [Sat, 24 Jun 2017 05:14:11 +0000 (05:14 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev am:
7fce51594e
am:
1ccaf797c4
Change-Id: I34e5281cc999cf7ace2c0e8d078a06685160ddb2
Eric Laurent [Sat, 24 Jun 2017 05:11:51 +0000 (05:11 +0000)]
Merge "AudioSystem: Add missing DEVICE_USB_HEADSET to DEVICE_USB_ALL" into oc-dr1-dev
am:
e2e01f7795
Change-Id: Ie80f463b6f84c2a5d543c3afd2f3fe5f3bc6c57c
Etan Cohen [Sat, 24 Jun 2017 05:11:36 +0000 (05:11 +0000)]
Merge "[P2P] Eliminate separate storage of binders - a memory leak" into oc-dr1-dev am:
0dd8a3cd59
am:
cd4fefc503
Change-Id: Iac1e18eb99bcd78c5d7b7617a28926f5dc1ebb99
Jean-Michel Trivi [Sat, 24 Jun 2017 05:09:51 +0000 (05:09 +0000)]
Merge "Total Silence vs VoIP" into oc-dr1-dev
am:
92e1d0ab44
Change-Id: I7a1123ed362d884dfbbee21c8e04595e55844ecd
Wale Ogunwale [Sat, 24 Jun 2017 05:07:06 +0000 (05:07 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev am:
0b138595de
am:
9d30c653d3
Change-Id: I31aa7938f945686bb3c5fc1efe84b27482fcc5cc
Bryce Lee [Sat, 24 Jun 2017 05:06:50 +0000 (05:06 +0000)]
Merge "Add ActivityInfo logging." into oc-dev am:
4b6219dab3 am:
a97e66c37a
am:
17054789a9
Change-Id: Ia5cad995eb3a92d10935ea8ea89f81687a169cfe
Selim Cinek [Sat, 24 Jun 2017 05:04:39 +0000 (05:04 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev am:
9bf5c0c3e1
am:
ff122e750c
Change-Id: Ia01ec63ef42441d8f1632a5b6280df2d8c52e41d
Etan Cohen [Sat, 24 Jun 2017 05:01:32 +0000 (05:01 +0000)]
Merge "[P2P] Eliminate separate storage of binders - a memory leak" into oc-dr1-dev
am:
0dd8a3cd59
Change-Id: I56340c7f580266a4cbb1d1956d063f33cd414e40
Bryce Lee [Sat, 24 Jun 2017 04:58:36 +0000 (04:58 +0000)]
Merge "Add ActivityInfo logging." into oc-dev am:
4b6219dab3
am:
a97e66c37a
Change-Id: I946c82ce19f6a8ed7b889380ebd71eb8a4a26788
Jack Yu [Sat, 24 Jun 2017 04:56:55 +0000 (04:56 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev am:
5af2d63721
am:
429499f813 -s ours
Change-Id: Iad25d85eb0d115818b4f7e596420a38488e040e8
Jack Yu [Sat, 24 Jun 2017 04:47:36 +0000 (04:47 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev
am:
5af2d63721
Change-Id: I1ab48412baffcbc6ad2b98ea0966cff20c9762aa
TreeHugger Robot [Sat, 24 Jun 2017 04:44:05 +0000 (04:44 +0000)]
Merge "Protect a11y against multi-threaded UIs" into oc-dr1-dev
Daniel Sandler [Sat, 24 Jun 2017 02:19:56 +0000 (02:19 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev am:
7fce51594e am:
3a1b93d109
am:
157e546592
Change-Id: Ibf20001432d10524f00e0898fc3ec9a1ca3dc0c8
Daniel Sandler [Sat, 24 Jun 2017 02:13:45 +0000 (02:13 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev am:
7fce51594e
am:
3a1b93d109
Change-Id: Ib38e47fe9e839d6ad85b48adffd2eaf4f9b86f2a
Daniel Sandler [Sat, 24 Jun 2017 02:03:02 +0000 (02:03 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev
am:
7fce51594e
Change-Id: I706b0ed179cad649cbcdbe2dee7c621852bd024e
Wale Ogunwale [Sat, 24 Jun 2017 02:02:51 +0000 (02:02 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev am:
0b138595de am:
fa0543936c
am:
1c91f30de9
Change-Id: I503d5c009aa92f6299a4f8fe98489e34e716785e
Daniel Sandler [Sat, 24 Jun 2017 02:02:17 +0000 (02:02 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev
am:
7fce51594e
Change-Id: Ia84326f38bbd1154c9ee5a76c3952a9c5e0699f2
TreeHugger Robot [Sat, 24 Jun 2017 01:58:32 +0000 (01:58 +0000)]
Merge "AudioSystem: Add missing DEVICE_USB_HEADSET to DEVICE_USB_ALL" into oc-dr1-dev
Daniel Sandler [Sat, 24 Jun 2017 01:50:34 +0000 (01:50 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev
Wale Ogunwale [Sat, 24 Jun 2017 01:48:11 +0000 (01:48 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev am:
0b138595de
am:
fa0543936c
Change-Id: I5f7e107cd0aa360152ac8a26f4d566f7aa16223e
Jean-Michel Trivi [Sat, 24 Jun 2017 01:39:16 +0000 (01:39 +0000)]
Merge "Total Silence vs VoIP" into oc-dr1-dev
Wale Ogunwale [Sat, 24 Jun 2017 01:35:55 +0000 (01:35 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev
am:
0b138595de
Change-Id: Icaaaca9735c18d10dcb414c82d2b6833c95ab6e9
Wale Ogunwale [Sat, 24 Jun 2017 01:35:49 +0000 (01:35 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev
am:
0b138595de
Change-Id: I9cb5f092e253f06fc2abe4c90c9070ecf472125f
TreeHugger Robot [Sat, 24 Jun 2017 01:21:39 +0000 (01:21 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev
Selim Cinek [Sat, 24 Jun 2017 01:16:06 +0000 (01:16 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev am:
9bf5c0c3e1 am:
12a2a7d0f1
am:
ec85913a74
Change-Id: I41d8577da4a6ca93252027bd85ee632decaae56f
Selim Cinek [Sat, 24 Jun 2017 01:05:22 +0000 (01:05 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev am:
9bf5c0c3e1
am:
12a2a7d0f1
Change-Id: Ice72e01f1ce2a38739c4306b9df4ab33bc16b2c9
Hugo Benichi [Sat, 24 Jun 2017 01:00:44 +0000 (01:00 +0000)]
Merge changes I193297e0,I43beb966 am:
c729ff8253 am:
5dec1df23b -s ours am:
050c95d679
am:
62e66c1bec
Change-Id: I929895e27f55e04da56387fd62f39d0d73f6bc65
Selim Cinek [Sat, 24 Jun 2017 00:55:48 +0000 (00:55 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev
am:
9bf5c0c3e1
Change-Id: Ic93f722459de8da30b9b2f8971dfd0b650e37f10
Selim Cinek [Sat, 24 Jun 2017 00:55:46 +0000 (00:55 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev
am:
9bf5c0c3e1
Change-Id: I9f1dc8c2c6d2ad461efc2722a5b1829f753dfcd4
Hugo Benichi [Sat, 24 Jun 2017 00:51:09 +0000 (00:51 +0000)]
Merge changes I193297e0,I43beb966 am:
c729ff8253 am:
5dec1df23b -s ours
am:
050c95d679
Change-Id: Ic54e19a430fb16732197f289b46e5a3c8669d26f
Selim Cinek [Sat, 24 Jun 2017 00:44:08 +0000 (00:44 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev
Hugo Benichi [Sat, 24 Jun 2017 00:40:48 +0000 (00:40 +0000)]
Merge changes I193297e0,I43beb966 am:
c729ff8253
am:
5dec1df23b -s ours
Change-Id: If036f9c7b4219a20ddb21d5aa1b7f3e3b29bee51
Etan Cohen [Sat, 24 Jun 2017 00:36:50 +0000 (00:36 +0000)]
Merge "[P2P] Eliminate separate storage of binders - a memory leak" into oc-dr1-dev
OSDN Git Service
