OSDN Git Service
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
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:47:36 +0000 (04:47 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev
am:
5af2d63721
Change-Id: I1ab48412baffcbc6ad2b98ea0966cff20c9762aa
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:02:17 +0000 (02:02 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev
am:
7fce51594e
Change-Id: Ia84326f38bbd1154c9ee5a76c3952a9c5e0699f2
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
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:05:22 +0000 (01:05 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev am:
9bf5c0c3e1
am:
12a2a7d0f1
Change-Id: Ice72e01f1ce2a38739c4306b9df4ab33bc16b2c9
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
Selim Cinek [Sat, 24 Jun 2017 00:22:38 +0000 (17:22 -0700)]
Fixed an issue in the contrast calculation
The parameters were passed the wrong way around.
Test: manual inspection
Fixes:
62937149
Change-Id: I7ae2bb2a4136da37d6b59b2b1406c68ce7fe7b6b
Hugo Benichi [Sat, 24 Jun 2017 00:13:24 +0000 (00:13 +0000)]
Merge changes I193297e0,I43beb966
am:
c729ff8253
Change-Id: Ie35f8cfe6ab77d0547f38b3bdcaf8f57832c0354
Bryce Lee [Sat, 24 Jun 2017 00:03:05 +0000 (00:03 +0000)]
Merge "Add ActivityInfo logging." into oc-dev am:
4b6219dab3
am:
7fd14c46ef
Change-Id: If62a47ee3cefc509cd0fa406ef5cb43a0f521280
Hugo Benichi [Sat, 24 Jun 2017 00:01:22 +0000 (00:01 +0000)]
Merge changes I193297e0,I43beb966
* changes:
NetworkCapabilities: Added support for TRANSPORT_LOWPAN
Connectivity metrics: serialize networkId, transports, ifname
Bryce Lee [Fri, 23 Jun 2017 23:53:45 +0000 (23:53 +0000)]
Merge "Add ActivityInfo logging." into oc-dev
am:
4b6219dab3
Change-Id: I01029ae8a05578e615683f326fe66df0b1e05bf8
Bryce Lee [Fri, 23 Jun 2017 23:53:33 +0000 (23:53 +0000)]
Merge "Add ActivityInfo logging." into oc-dev
am:
4b6219dab3
Change-Id: I6b4ac6518fab138ffa3b218e9471149018fb1f34
Bryce Lee [Fri, 23 Jun 2017 23:45:15 +0000 (23:45 +0000)]
Merge "Add ActivityInfo logging." into oc-dev
Bryce Lee [Fri, 23 Jun 2017 21:53:02 +0000 (14:53 -0700)]
Add ActivityInfo logging.
This changelist adds additional logging around the ActivityInfo used
during startActivity to trace down when the userid changes.
Bug:
38121026
Test: manual
Change-Id: I162f4772845bc2cae585b7e4b027f3cce33439f4
Jack Yu [Fri, 23 Jun 2017 23:13:50 +0000 (23:13 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev
Wale Ogunwale [Fri, 23 Jun 2017 21:52:40 +0000 (14:52 -0700)]
Fixed some rotation while unlocking screen issue.
- Don't use snapshot that is in different orientation than the current
display orientation. This is a follow up to a previous CL whose
implementation wasn't complete.
- Disabled fixed for unnecessary relaunches when unlocking with
fingerprint sensor introduced in ag/
2310557. This causes regression in
the experience from N. We still have the relaunches, but we cover up the
delay by displaying the apps starting window.
- Added more trace log points.
Fixes:
62796190
Fixes:
62904487
Bug:
38494778
Test: go/wm-smoke and manual verification of bug.
Change-Id: Id161a334cb4455dd9eb25c6bb63d5bb3f8a6f1f0
Android Build Merger (Role) [Fri, 23 Jun 2017 22:55:51 +0000 (22:55 +0000)]
Merge "Merge "Fix for the missing focus in WebView form fields." into oc-dev am:
c34dec82a9 am:
d2cca60d09" into oc-dr1-dev-plus-aosp
susnata [Fri, 23 Jun 2017 22:52:32 +0000 (22:52 +0000)]
Merge "Fix for the missing focus in WebView form fields." into oc-dev am:
c34dec82a9
am:
ab40d62d2c
Change-Id: I14d5910c5009a17f507b701aa461f862c4075152
susnata [Fri, 23 Jun 2017 22:52:29 +0000 (22:52 +0000)]
Merge "Fix for the missing focus in WebView form fields." into oc-dev am:
c34dec82a9
am:
d2cca60d09
Change-Id: I527fc6e849523b95521c6efae016b3b8a86255ca
susnata [Fri, 23 Jun 2017 22:43:03 +0000 (22:43 +0000)]
Merge "Fix for the missing focus in WebView form fields." into oc-dev
am:
c34dec82a9
Change-Id: Iec9bf203d787d5dcf585b8091bb32b20f1e09f37
susnata [Fri, 23 Jun 2017 22:43:02 +0000 (22:43 +0000)]
Merge "Fix for the missing focus in WebView form fields." into oc-dev
am:
c34dec82a9
Change-Id: I3f2c62afeef92a926f23d6a7862646f830f35542
TreeHugger Robot [Fri, 23 Jun 2017 22:33:10 +0000 (22:33 +0000)]
Merge "Fix for the missing focus in WebView form fields." into oc-dev
Wei Wang [Fri, 23 Jun 2017 22:23:34 +0000 (22:23 +0000)]
Merge "ContextHubSystemService: Init of ContextHubSystemService in a parallel thread" into oc-dr1-dev
am:
d6720f0b55
Change-Id: Ice9256fccb8630e7793698361e215ab939a47d02
Wei Wang [Fri, 23 Jun 2017 22:13:34 +0000 (22:13 +0000)]
Merge "ContextHubSystemService: Init of ContextHubSystemService in a parallel thread" into oc-dr1-dev
Chen Xu [Fri, 23 Jun 2017 21:43:59 +0000 (21:43 +0000)]
Merge "Handle invalid destination address gracefully" into oc-dr1-dev
am:
93ea43386e
Change-Id: I0e36a295ca481bb5c9b0fc77cb0d2e56d9cbfd0c
Elliott Hughes [Fri, 23 Jun 2017 21:38:59 +0000 (21:38 +0000)]
Merge "Replace MallocHelper with std::unique_ptr." am:
8330d5212d am:
6dfb0ca3d5
am:
7bb95c55c0
Change-Id: I3e78c1732189a07e2ff17b046f71c7db435d9e3c
Jack Yu [Thu, 22 Jun 2017 00:42:37 +0000 (17:42 -0700)]
Refactored area update info support
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug:
37746109
Merged-In: Ic1c4683ecfe0556547ba15eb9b9e780644f17bff
Change-Id: Ic1c4683ecfe0556547ba15eb9b9e780644f17bff
Chen Xu [Fri, 23 Jun 2017 21:34:10 +0000 (21:34 +0000)]
Merge "Handle invalid destination address gracefully" into oc-dr1-dev
Robert Sloan [Fri, 23 Jun 2017 21:29:26 +0000 (21:29 +0000)]
Merge "resolve merge conflicts of
2e21f8d8cbbe to oc-dev-plus-aosp" into oc-dev-plus-aosp
am:
87041ff9a4
Change-Id: I02b2afb08ba8dc8f5601805cfd94c7cbb4ba020a
Elliott Hughes [Fri, 23 Jun 2017 21:26:41 +0000 (21:26 +0000)]
Merge "Replace MallocHelper with std::unique_ptr." am:
8330d5212d
am:
6dfb0ca3d5
Change-Id: Ib4853eeb3e5524935780881a1758262d50ab8e29
TreeHugger Robot [Fri, 23 Jun 2017 21:21:33 +0000 (21:21 +0000)]
Merge "resolve merge conflicts of
2e21f8d8cbbe to oc-dev-plus-aosp" into oc-dev-plus-aosp
Tyler Gunn [Fri, 23 Jun 2017 21:07:04 +0000 (21:07 +0000)]
Merge "Define handover event sent when source disconnects prior to handover." into oc-dr1-dev
am:
06c32f21fc
Change-Id: If1dd5aeaf3c53bad126a56670e74676147ac4859
Ying Xu [Fri, 23 Jun 2017 21:04:25 +0000 (21:04 +0000)]
Merge "Add flag to wipe eUICC data" into oc-dr1-dev
am:
05ce703c87
Change-Id: I556f01f7f317e639f8a33a981154721e53a95641
Tyler Gunn [Fri, 23 Jun 2017 20:54:59 +0000 (20:54 +0000)]
Merge "Define handover event sent when source disconnects prior to handover." into oc-dr1-dev
Ying Xu [Fri, 23 Jun 2017 20:52:50 +0000 (20:52 +0000)]
Merge "Add flag to wipe eUICC data" into oc-dr1-dev
Lucas Dupin [Fri, 23 Jun 2017 19:34:22 +0000 (19:34 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev am:
9b73401191
am:
c3c7bdf043
Change-Id: I6cb65e11c3a84f9555fd72d2d6709b3a26d7deec
Lucas Dupin [Fri, 23 Jun 2017 19:28:15 +0000 (19:28 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev am:
9b73401191
am:
c84cd09d36
Change-Id: Icac23cee9b3efb082061d19858b248bfdd860bd2
Lucas Dupin [Fri, 23 Jun 2017 19:22:05 +0000 (19:22 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev
am:
9b73401191
Change-Id: Iad0f7b3ff9db9128e825b72040cc4c9123dde4c1
Lucas Dupin [Fri, 23 Jun 2017 19:20:35 +0000 (19:20 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev
am:
9b73401191
Change-Id: Iabd5160cdc09c36d7f565079f9dfd09969529c88
Lucas Dupin [Fri, 23 Jun 2017 19:11:11 +0000 (19:11 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev
Robert Sloan [Fri, 23 Jun 2017 19:09:47 +0000 (12:09 -0700)]
resolve merge conflicts of
2e21f8d8cbbe to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9c6e9a52e67a06c16b6c8fb6f8eb4647b2fec508
Brad Ebinger [Fri, 23 Jun 2017 18:40:43 +0000 (18:40 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" into oc-dr1-dev
am:
beca22868c
Change-Id: I0ecd6a43d4375d3ac4d7d54b3d437832c0221f05
Brad Ebinger [Fri, 23 Jun 2017 18:32:08 +0000 (18:32 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" into oc-dr1-dev
Peter Qiu [Fri, 23 Jun 2017 18:31:08 +0000 (18:31 +0000)]
Merge changes from topic 'wrong_password' into oc-dr1-dev
am:
702d4d56fe
Change-Id: I827bed9cd0c57abb33c91af05a089f8f2f5d59fb
TreeHugger Robot [Fri, 23 Jun 2017 18:18:58 +0000 (18:18 +0000)]
Merge changes from topic 'wrong_password' into oc-dr1-dev
* changes:
SettingsLib: set network status for wrong password error
wifi: add "wrong password" network disabled reason
Elliott Hughes [Fri, 23 Jun 2017 18:00:09 +0000 (18:00 +0000)]
Merge "Replace MallocHelper with std::unique_ptr."
am:
8330d5212d
Change-Id: I6ec7b1ddd823b48f3033546416e6ffc81d24c03a
yinxu [Mon, 19 Jun 2017 17:28:19 +0000 (10:28 -0700)]
Add flag to wipe eUICC data
Add a new flag in the DevicePolicyManager so that we can Use
EuiccManager#eraseSubscriptions(PendingIntent) to erase all the carrier data
from eUICC chip if the user choose to "ERASE" from the Android device manager.
Bug:
37277944
Test: E2E
Change-Id: Ia78090a00d956c645725be4fd591e02ded8ec467
Robert Sloan [Fri, 23 Jun 2017 17:53:23 +0000 (17:53 +0000)]
Merge "Don't statically link libcrypto in frameworks."
am:
a730fd2e64
Change-Id: I322c917f898d299db72272572453f968b4ec4beb
Elliott Hughes [Fri, 23 Jun 2017 17:51:45 +0000 (17:51 +0000)]
Merge "Replace MallocHelper with std::unique_ptr."
Treehugger Robot [Fri, 23 Jun 2017 17:42:38 +0000 (17:42 +0000)]
Merge "Don't statically link libcrypto in frameworks."
Android Build Merger (Role) [Fri, 23 Jun 2017 17:30:45 +0000 (17:30 +0000)]
Merge "Merge "Emergency SUPL when location is disabled" into oc-dev am:
2ffd98670f am:
41bf50cc8b -s ours" into oc-dr1-dev-plus-aosp
Siddharth Ray [Fri, 23 Jun 2017 17:29:46 +0000 (17:29 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev am:
2ffd98670f -s ours
am:
f79158f5ac -s ours
Change-Id: Ie6cd440bfe4e0294a400008ca7c6c0e7172f0f6a
Siddharth Ray [Fri, 23 Jun 2017 17:29:40 +0000 (17:29 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev am:
2ffd98670f
am:
41bf50cc8b -s ours
Change-Id: I4ab0165d67a75794ca9559b96a533eb5789dd93a
Siddharth Ray [Fri, 23 Jun 2017 17:19:45 +0000 (17:19 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
am:
2ffd98670f
Change-Id: I7f57683e774109f301e0763607853674c6fda9c9
Siddharth Ray [Fri, 23 Jun 2017 17:19:37 +0000 (17:19 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
am:
2ffd98670f -s ours
Change-Id: I44d903a9ce1a53faa9e1633cc8d69e322454704d
TreeHugger Robot [Fri, 23 Jun 2017 17:12:22 +0000 (17:12 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
Dan Sandler [Fri, 23 Jun 2017 16:42:19 +0000 (12:42 -0400)]
Remove unnecessary dumpsys output.
Change-Id: I5ec0b6b44fca58e9f5f61444acbff7a15550b135
Fixes:
62828801
Test: adb shell dumpsys activity service SystemUI | grep -c tickerText
(should be zero)
Lucas Dupin [Fri, 23 Jun 2017 16:30:49 +0000 (09:30 -0700)]
Fix notification contrast with transparent bg
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
Change-Id: I2f0595408be61acb8267bb7449486ee46f7aad19
Fixes:
62937149
susnata [Fri, 23 Jun 2017 16:13:05 +0000 (09:13 -0700)]
Fix for the missing focus in WebView form fields.
This looks like a regression for WebView (58.0.3029.125) in android
'O'. But this seems to have been fixed in early version of 60 (webview).
This workaround gets us past the problem, until we get the newer version
of WebView.
Bug:
62449959
Test: Manual
Change-Id: I29883bf7d1567c1ce7be90b4efde4b3da93b99a2
Meng Wang [Fri, 23 Jun 2017 16:08:08 +0000 (16:08 +0000)]
Merge "Show error code in WFC error messages." into oc-dr1-dev
am:
a871f0f131
Change-Id: Ibab724fa3f48e765fbd208e5ab0b9af32fcef38d
Meng Wang [Fri, 23 Jun 2017 16:00:50 +0000 (16:00 +0000)]
Merge "Show error code in WFC error messages." into oc-dr1-dev
Android Build Merger (Role) [Fri, 23 Jun 2017 15:32:57 +0000 (15:32 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
b39c08f9d7 -s ours am:
53f4db5612 -s ours" into oc-dr1-dev-plus-aosp
Tyler Gunn [Fri, 23 Jun 2017 15:32:00 +0000 (08:32 -0700)]
Define handover event sent when source disconnects prior to handover.
Define new event which is sent to the destination call if the source
disconnects prior to the completion of the handover.
Test: Manual using test app
Bug:
62904673
Change-Id: I9fa74e374f78beb801f08ce1fd7260d7d7fe7cac
Bill Yi [Fri, 23 Jun 2017 15:30:56 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b39c08f9d7 -s ours
am:
53f4db5612 -s ours
Change-Id: I74facd707fb3203105b66d6853052bef461e4419
Bill Yi [Fri, 23 Jun 2017 15:30:52 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b39c08f9d7 -s ours
am:
3cd12a1ca7 -s ours
Change-Id: Ibf672901baeae0668e40f04c37b2ab56801b5864
Bill Yi [Fri, 23 Jun 2017 15:21:28 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b39c08f9d7 -s ours
Change-Id: I32484f5c5715c17c439d5ff20fcd8e46b8061c18
Bill Yi [Fri, 23 Jun 2017 15:21:23 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
64465df428 -s ours
Change-Id: Iec197b243600ad21d9e58b272961d3d9ba167f42
Bill Yi [Fri, 23 Jun 2017 15:21:22 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b39c08f9d7 -s ours
Change-Id: Ib2921d235716e858bddbbb2e3a9588b4133d9c84
TreeHugger Robot [Fri, 23 Jun 2017 15:12:07 +0000 (15:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 15:11:46 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 23 Jun 2017 15:11:07 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
ccaf50b6a7 -s ours
Change-Id: I95cc8323a6e20d4cdc604dafd0b268fcb42b66d9
TreeHugger Robot [Fri, 23 Jun 2017 15:01:06 +0000 (15:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Android Build Merger (Role) [Fri, 23 Jun 2017 12:58:59 +0000 (12:58 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
d406f38d24 -s ours am:
8c311afb87 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Fri, 23 Jun 2017 12:58:10 +0000 (12:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
d406f38d24 -s ours
am:
8c311afb87 -s ours
Change-Id: Ic0d5736c5d040abc951562fdc984359f76e9e348
Bill Yi [Fri, 23 Jun 2017 12:56:45 +0000 (12:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
d406f38d24 -s ours
am:
08947751fd -s ours
Change-Id: I62dfb3722c51f91adc59a568c6d92e0e608bbf50
Winson Chung [Fri, 23 Jun 2017 12:51:36 +0000 (12:51 +0000)]
Merge "Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d" into oc-dr1-dev
am:
fda69197b1
Change-Id: Ib653a64b6b5d700ebad94cd07a0fb353080a0e8d
Bill Yi [Fri, 23 Jun 2017 12:49:16 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9c543b5a06 -s ours
Change-Id: I4a776102e1ecdfc0da70e0a6a91f0b49e5854edc
Bill Yi [Fri, 23 Jun 2017 12:49:12 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d406f38d24 -s ours
Change-Id: I898195fead15228c4e4fa5617dacbddfc90dc6e2
Bill Yi [Fri, 23 Jun 2017 12:49:11 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d406f38d24 -s ours
Change-Id: I45a76be2cec8829147d9ac4569da2087bf6722bd
Android Build Merger (Role) [Fri, 23 Jun 2017 12:46:05 +0000 (12:46 +0000)]
Merge "Merge "Rename Binder.destroy() to Binder.destroyBinder()." am:
a634b38c8e am:
1b4b326128 am:
17bb92fe14" into oc-dr1-dev-plus-aosp
Vladimir Marko [Fri, 23 Jun 2017 12:45:17 +0000 (12:45 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()." am:
a634b38c8e am:
1b4b326128
am:
17bb92fe14
Change-Id: I08ab885e0b4373074e5eba3d36dcbb73c87458dc
Android Build Merger (Role) [Fri, 23 Jun 2017 12:44:54 +0000 (12:44 +0000)]
Merge "Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d am:
a8e14f2448" into oc-dr1-dev-plus-aosp
Winson Chung [Fri, 23 Jun 2017 12:44:01 +0000 (12:44 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d
am:
a8e14f2448
Change-Id: I2a53a421fbfc3d97309b8b4be1a1a7b215f0c3a1
Android Build Merger (Role) [Fri, 23 Jun 2017 12:43:32 +0000 (12:43 +0000)]
Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7 am:
7a3df45483" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 23 Jun 2017 12:42:49 +0000 (12:42 +0000)]
Merge "Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7" into oc-dr1-dev am:
72b2701fbb" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 23 Jun 2017 12:42:32 +0000 (12:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Roshan Pius [Fri, 23 Jun 2017 12:42:12 +0000 (12:42 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7
am:
7a3df45483
Change-Id: I9aad81e9015ac22d43c2864ec58213ccb22df54d
OSDN Git Service
