OSDN Git Service
Jorim Jaggi [Tue, 23 Aug 2016 15:35:03 +0000 (15:35 +0000)]
Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev am:
c7136b3b3c
am:
9b2c0bf87e
Change-Id: I3631edf2a9f0e76b9670ba6bbfc1905c1503ff7c
Jorim Jaggi [Tue, 23 Aug 2016 15:34:06 +0000 (15:34 +0000)]
Change retail mode wallpaper (1/2) am:
6c902d0453
am:
9d0879c6ac
Change-Id: I639e21420319261126227da7296e876a07976dc1
Adam Powell [Tue, 23 Aug 2016 15:33:59 +0000 (15:33 +0000)]
Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am:
081e393103" into nyc-mr1-dev
am:
b352d0a45a
Change-Id: Ied7ef0ddeb4bbc5c80f5ccce5aa817b0a9244655
Adam Powell [Tue, 23 Aug 2016 15:33:57 +0000 (15:33 +0000)]
Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am:
081e393103
am:
1b192da3fe
Change-Id: If8df0bd5aec1d32da478d7c12ee7c16d6bf388a7
Adam Powell [Tue, 23 Aug 2016 15:33:51 +0000 (15:33 +0000)]
Merge "Only dispatch window visibility aggregation for targetSdk >= N am:
64e1ba4398" into nyc-mr1-dev
am:
998ff1c7be
Change-Id: I73b8052c7f2340c53ba1055bff6533cb19671018
Adam Powell [Tue, 23 Aug 2016 15:33:49 +0000 (15:33 +0000)]
Only dispatch window visibility aggregation for targetSdk >= N am:
64e1ba4398
am:
02abbe8d4c
Change-Id: I66f8610e52f2aaf06b02fa8d369692fc2f89ee17
Dirk Dougherty [Tue, 23 Aug 2016 15:25:23 +0000 (15:25 +0000)]
Merge "Doc change: intl page updates for final n release. am:
e816f1f542 am:
79d9e9df2e" into nyc-mr1-dev
am:
f14ba4c10f
Change-Id: Ie7c4ee20cfc16a135bb5a2116442215bb2afd74b
Dirk Dougherty [Tue, 23 Aug 2016 15:25:21 +0000 (15:25 +0000)]
Doc change: intl page updates for final n release. am:
e816f1f542 am:
79d9e9df2e
am:
4a273d8bb9
Change-Id: Iefccf2db7748d32325e8f3657f53a9aabb3d83c2
Chris Tate [Tue, 23 Aug 2016 15:25:15 +0000 (15:25 +0000)]
Merge "Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am:
56ce19099d" into nyc-mr1-dev
am:
2733c16556
Change-Id: I44879ede18607dfa21984f3d059cfdd80193b246
Chris Tate [Tue, 23 Aug 2016 15:25:13 +0000 (15:25 +0000)]
Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am:
56ce19099d
am:
ad3f9a03ea
Change-Id: I329ca50f9bc4049be3da5f936ab432f47f33a9ba
Christopher Tate [Tue, 23 Aug 2016 15:25:08 +0000 (15:25 +0000)]
Merge "Fix wallpaper backup eligibility test am:
f7d1b5de6e" into nyc-mr1-dev
am:
e022290806
Change-Id: Ib016b9731e1efa1980112ed2d38e8553ff0973d0
Christopher Tate [Tue, 23 Aug 2016 15:25:06 +0000 (15:25 +0000)]
Fix wallpaper backup eligibility test am:
f7d1b5de6e
am:
100b610066
Change-Id: I243b821aa35b75ad69ed9ddcf45ef6a4342e4605
Adam Seaton [Tue, 23 Aug 2016 15:25:01 +0000 (15:25 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev am:
051d6b74eb -s ours" into nyc-mr1-dev
am:
f7e165972f -s ours
Change-Id: I02c1cbaec6994edc21b25413101f6dccbb1c091f
Adam Seaton [Tue, 23 Aug 2016 15:25:00 +0000 (15:25 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev am:
051d6b74eb -s ours
am:
6b5a4bf98b -s ours
Change-Id: I6ca4a4f6d3a7269ec69ec3c9f0966237ab9cc5c3
Tim Murray [Tue, 23 Aug 2016 15:24:55 +0000 (15:24 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads. am:
d72b26085c -s ours" into nyc-mr1-dev
am:
6a1c2227be -s ours
Change-Id: I4a384d1e1ea2cfb822fe56bbc3c0197891919678
Tim Murray [Tue, 23 Aug 2016 15:24:54 +0000 (15:24 +0000)]
DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads. am:
d72b26085c -s ours
am:
fbc47f734f -s ours
Change-Id: I2174dc610823bc9a9ea58bbd55a30095db569c09
Android Build Merger (Role) [Tue, 23 Aug 2016 15:14:56 +0000 (15:14 +0000)]
Merge "Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw." into nyc-mr1-dev am:
4a6f3bb921" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:14:37 +0000 (15:14 +0000)]
Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. am:
0cc68dbf29" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:14:20 +0000 (15:14 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am:
ad1008d089 -s ours am:
aad9147dca -s ours" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:14:03 +0000 (15:14 +0000)]
Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am:
05a1df9967 -s ours am:
33a04f8333 -s ours" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:13:45 +0000 (15:13 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am:
0f1e7ab1d3 -s ours am:
fcd16254c6 -s ours" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:13:26 +0000 (15:13 +0000)]
Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am:
c9373e5505 -s ours am:
27d769e3b0 -s ours" into cw-f-dev
Sanket Padawe [Tue, 23 Aug 2016 15:12:31 +0000 (15:12 +0000)]
Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw." into nyc-mr1-dev
am:
4a6f3bb921
Change-Id: Iae5f5a526b45c583eec1439bd43a6548b319c142
Sanket Padawe [Tue, 23 Aug 2016 15:12:29 +0000 (15:12 +0000)]
If Vodafone Italy sim is in Spain consider it as roaming on Spain nw.
am:
0cc68dbf29
Change-Id: I2aa45f5db13bc867a23663a14ab6330285a6e872
Adam Seaton [Tue, 23 Aug 2016 15:12:26 +0000 (15:12 +0000)]
Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am:
ad1008d089 -s ours
am:
aad9147dca -s ours
Change-Id: I7e5040b8246458a5a24afa28fec9469a4b223652
Andy Hung [Tue, 23 Aug 2016 15:12:25 +0000 (15:12 +0000)]
DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am:
05a1df9967 -s ours
am:
33a04f8333 -s ours
Change-Id: I123cf216c3654a4572d64400b91265f956d53ac7
Adam Seaton [Tue, 23 Aug 2016 15:12:23 +0000 (15:12 +0000)]
Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am:
0f1e7ab1d3 -s ours
am:
fcd16254c6 -s ours
Change-Id: Iff2337eeb9148078fc5f2774d5c72dbd39360fec
George Mount [Tue, 23 Aug 2016 15:12:22 +0000 (15:12 +0000)]
DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am:
c9373e5505 -s ours
am:
27d769e3b0 -s ours
Change-Id: Ie414fbc28d07642febe6c6dcf2e30283fbc802c0
Android Build Merger (Role) [Tue, 23 Aug 2016 15:11:05 +0000 (15:11 +0000)]
Merge "DO NOT MERGE ANYWHERE: Release mPackages lock earlier am:
bab7c28e5e -s ours am:
655932af79 -s ours" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:49 +0000 (15:10 +0000)]
Merge "Doc change: updates for final N landing page and related resources. am:
b0ca00431f am:
b78a9bc5fe am:
1dba7ddf3a" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:33 +0000 (15:10 +0000)]
Merge "Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am:
410ae5b004 am:
e5036b3cab am:
d6ad4f051e" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:22 +0000 (15:10 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page. am:
cbaf3f9986 am:
2663c419c0 am:
7208e94355" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:09 +0000 (15:10 +0000)]
Merge "Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am:
162a0005ac am:
c02c6b8fb0 am:
32d77972d5" into cw-f-dev
Todd Kennedy [Tue, 23 Aug 2016 15:09:17 +0000 (15:09 +0000)]
DO NOT MERGE ANYWHERE: Release mPackages lock earlier am:
bab7c28e5e -s ours
am:
655932af79 -s ours
Change-Id: If5e283f29ca14e7eb7d2dbf7edefe3f5a2be4223
Dirk Dougherty [Tue, 23 Aug 2016 15:09:15 +0000 (15:09 +0000)]
Doc change: updates for final N landing page and related resources. am:
b0ca00431f am:
b78a9bc5fe
am:
1dba7ddf3a
Change-Id: I21b0522b626433fa932618092b97f42acf108f6d
David Friedman [Tue, 23 Aug 2016 15:09:12 +0000 (15:09 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am:
410ae5b004 am:
e5036b3cab
am:
d6ad4f051e
Change-Id: Ic8ad057a85b59e3140881b4deccfb0c0add24960
David Friedman [Tue, 23 Aug 2016 15:09:10 +0000 (15:09 +0000)]
Docs: Adding information to Building-for-Billions landing page. am:
cbaf3f9986 am:
2663c419c0
am:
7208e94355
Change-Id: I04ef62e6851ee429fbc2607beb54a54b6a4120a4
Julius D'souza [Tue, 23 Aug 2016 15:09:08 +0000 (15:09 +0000)]
Merge "DO NOT MERGE: Add dynamic illuminance hysteresis support" into cw-f-dev
David Friedman [Tue, 23 Aug 2016 15:09:07 +0000 (15:09 +0000)]
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am:
162a0005ac am:
c02c6b8fb0
am:
32d77972d5
Change-Id: Iccae3409ae8a7797ebd8ffa67aad496f51a890c7
David Friedman [Tue, 23 Aug 2016 15:00:17 +0000 (15:00 +0000)]
Docs: Adds a redirect to make it easier to access Performance section on DAC. am:
196cb73dbb am:
f5c5eb0045
am:
5e1468cdbd
Change-Id: I5e81ab82e8e3e9c321b57d31333c4a40283e86ba
Jim Miller [Tue, 23 Aug 2016 15:00:15 +0000 (15:00 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42 am:
ddf70b9195 am:
364a51221a -s ours am:
ce0856f702 am:
41d1827fd3
am:
a7025c283c
Change-Id: Id53a357acd6b5ac900963d216aaf441471991f3a
Jim Miller [Tue, 23 Aug 2016 15:00:13 +0000 (15:00 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2 am:
9f04985991 am:
85c390e9fb -s ours am:
f159feff98 am:
ade6f4df5b
am:
634aafc181
Change-Id: I17a1313244d56f6e416f5a0252ee3f6681e19763
Sudheer Shanka [Tue, 23 Aug 2016 15:00:11 +0000 (15:00 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9 am:
58def3804c -s ours am:
e49de5e073 am:
105453e170
am:
8887e258a9
Change-Id: Ic9dfa00be5c10ab4d09e55587fa25f8b88c0bbe2
Amith Yamasani [Tue, 23 Aug 2016 15:00:08 +0000 (15:00 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365 am:
5841c492a7 -s ours am:
f705730667 am:
d09a6aa0f0
am:
110bd114a8
Change-Id: Ia23820f580ae6fd4345e6fe4bd844b33e2459907
Sudheer Shanka [Tue, 23 Aug 2016 14:51:45 +0000 (14:51 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am:
badc5cd942 am:
f1e0a4a60c
am:
3cf8ad97d0
Change-Id: Ibf31e9162d42caa24f9f79b934a461925c194589
Amith Yamasani [Tue, 23 Aug 2016 14:51:43 +0000 (14:51 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
55eacb9441 am:
ac9bb3886d
am:
250a509a68
Change-Id: Ic5ed2c9b3b6f7779d59176db169c390a8762cd1b
Svetoslav Ganov [Tue, 23 Aug 2016 14:51:41 +0000 (14:51 +0000)]
Add resource based mechanism to grant default permissions am:
d44d46aa50
am:
fb53efd8f3
Change-Id: I734a4186b92c4dfed45c0269b6d2419e7971e802
Rob Carr [Tue, 23 Aug 2016 14:51:39 +0000 (14:51 +0000)]
Merge "Only allow focused window to select seamless rotation." into nyc-mr1-dev
am:
7ae506260e
Change-Id: I0b1d7c270c421bc1ec77d87b3ed74aa5f27a7b6b
Robert Carr [Tue, 23 Aug 2016 14:51:37 +0000 (14:51 +0000)]
Only allow focused window to select seamless rotation.
am:
828ec3dc51
Change-Id: I617dbf02a81a004a38ec3b1da1381ae0497f64ba
Dianne Hackborn [Tue, 23 Aug 2016 14:51:33 +0000 (14:51 +0000)]
Merge "Fix issue #
30929080: Default Assist app is set to None..." into nyc-mr1-dev
am:
d6ece3e175
Change-Id: Ic07c8b9212422afca01e28682608c577594d5931
Dianne Hackborn [Tue, 23 Aug 2016 14:51:30 +0000 (14:51 +0000)]
Fix issue #
30929080: Default Assist app is set to None...
am:
e9563659a5
Change-Id: I738c1126ffbffaa904e7d4533347a218a0ccecdd
Todd Kennedy [Tue, 23 Aug 2016 14:46:29 +0000 (14:46 +0000)]
Merge "Allow permission group updates" into nyc-mr1-dev
am:
ee2df0390e
Change-Id: I1c88a2863ddb2a60d94a5a84d49103789b849d42
Todd Kennedy [Tue, 23 Aug 2016 14:46:25 +0000 (14:46 +0000)]
Allow permission group updates
am:
21bd9b824f
Change-Id: I8f938705b6f25b2bd53410f5b496191ec2784a9c
Todd Kennedy [Tue, 23 Aug 2016 14:46:18 +0000 (14:46 +0000)]
Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev
am:
0060d6eda1
Change-Id: Ia8fb43fceea7f13a035a719a969e833b45e99408
Todd Kennedy [Tue, 23 Aug 2016 14:46:12 +0000 (14:46 +0000)]
Don't call into pkg mgr svc w/ lock held
am:
f29d07a62a
Change-Id: Iffd22d7e33a0870236576033658d420c22426b97
Tenghui Zhu [Tue, 23 Aug 2016 14:46:02 +0000 (14:46 +0000)]
Merge "Correctly report the transparent region" into nyc-mr1-dev
am:
f05765e3c4
Change-Id: I9978bb78a2ccd63ceccbab89bb7c783237c0f97f
Teng-Hui Zhu [Tue, 23 Aug 2016 14:45:55 +0000 (14:45 +0000)]
Correctly report the transparent region
am:
f8da30dc65
Change-Id: I2fa623c2893a6cea96843f78d46fe753913b6f4d
Salvador Martinez [Tue, 23 Aug 2016 14:45:43 +0000 (14:45 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev
am:
09b64ade22
Change-Id: I22142397ad0af75eb29ed2ba2b764f87d34825ca
Salvador Martinez [Tue, 23 Aug 2016 14:43:31 +0000 (14:43 +0000)]
Prevent wifi icon from disappearing
am:
823cd0e35a
Change-Id: I55a99176048dd30b46ae4ea2900b92e929c3a374
Rob Carr [Tue, 23 Aug 2016 14:43:23 +0000 (14:43 +0000)]
Merge "PopupWindow: Be more consistent about Gravity calculation." into nyc-mr1-dev
am:
b19915bea8
Change-Id: Ie2f4ab820f05ee91b4e0f45f3bfdc24801a44d81
Robert Carr [Tue, 23 Aug 2016 14:43:21 +0000 (14:43 +0000)]
PopupWindow: Be more consistent about Gravity calculation.
am:
798fb79866
Change-Id: Ia7c49dbe2fbe751565d6c8be46586a66c535a148
Tenghui Zhu [Tue, 23 Aug 2016 14:38:50 +0000 (14:38 +0000)]
Merge "Update the javaDoc for VectorDrawable and AnimatedVectorDrawable" into nyc-mr1-dev
am:
5cb0c13f76
Change-Id: I39f5fa1b99680d4d62ee157bdb2e5c65d09e9365
Teng-Hui Zhu [Tue, 23 Aug 2016 14:38:47 +0000 (14:38 +0000)]
Update the javaDoc for VectorDrawable and AnimatedVectorDrawable
am:
d64255f61d
Change-Id: I3999edd101b3188139c4dfd80b106820e1c9fdfc
Fan Zhang [Tue, 23 Aug 2016 14:38:41 +0000 (14:38 +0000)]
Merge "Update navup button content description when it's menu." into nyc-mr1-dev
am:
bf1d4cae3b
Change-Id: I44c5ebf3d83c707e9e2abb246a70c324d1e32fd4
Fan Zhang [Tue, 23 Aug 2016 14:38:37 +0000 (14:38 +0000)]
Update navup button content description when it's menu.
am:
c10db985f3
Change-Id: I1f954904540791d747540e102ce038866675b08a
Steve McKay [Tue, 23 Aug 2016 14:38:31 +0000 (14:38 +0000)]
Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev
am:
8499c13740
Change-Id: Ia3197b91667864b7353d4e047b04fe9dc9d2ed1b
Steve McKay [Tue, 23 Aug 2016 14:38:27 +0000 (14:38 +0000)]
DO NOT MERGE: Treat unknown tooltype as touch.
am:
0c28f3bda3
Change-Id: Idbee59d7450b63735291f5218784c87f762ed19b
Sungmin Choi [Tue, 23 Aug 2016 14:38:21 +0000 (14:38 +0000)]
Merge "telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network" into nyc-mr1-dev
am:
156d897f2e
Change-Id: Ia3421b6cbfdf858d2cfb77acd607c239da9497a9
Sungmin Choi [Tue, 23 Aug 2016 14:38:17 +0000 (14:38 +0000)]
telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network
am:
fd80d5482a
Change-Id: I2a11a4fecd14cce3362fb3d9e4416df923a7458d
Sanket Padawe [Tue, 23 Aug 2016 14:38:09 +0000 (14:38 +0000)]
Merge "Fix roam icon issues in Austria" into nyc-mr1-dev
am:
914354f334
Change-Id: Ice1d8843cb05a5bd788f14554c863837963c5f78
Sungmin Choi [Tue, 23 Aug 2016 14:38:02 +0000 (14:38 +0000)]
Fix roam icon issues in Austria
am:
f8912fc489
Change-Id: I2feb5bb95386316d209031db03dd14ba8b546aaa
Julius D'souza [Mon, 8 Aug 2016 02:08:30 +0000 (19:08 -0700)]
DO NOT MERGE: Add dynamic illuminance hysteresis support
Bug:
18572096
Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
Chong Zhang [Tue, 23 Aug 2016 14:30:23 +0000 (14:30 +0000)]
Merge "Make sure surface control is really valid before giving it to client" into nyc-mr1-dev
am:
f9f8e82045
Change-Id: I1d909be6bfa2f13dd05e170b87c11101525e6cf9
Chong Zhang [Tue, 23 Aug 2016 14:30:19 +0000 (14:30 +0000)]
Make sure surface control is really valid before giving it to client
am:
7581cddf25
Change-Id: Ibc06a598f98c14f9a986ab91fdb1d4b04152b65c
Raph Levien [Tue, 23 Aug 2016 14:30:13 +0000 (14:30 +0000)]
Merge "Update lint check to accommodate new emoji sequences" into nyc-mr1-dev
am:
e7ab3e1650
Change-Id: Iee7e2e454c63afbcd20f93e1a534c5f595f16101
Raph Levien [Tue, 23 Aug 2016 14:30:08 +0000 (14:30 +0000)]
Update lint check to accommodate new emoji sequences
am:
0790ac68bc
Change-Id: Id179440ba304c40c498555389deb7b9cad7dcd9f
Randy Pan [Tue, 23 Aug 2016 14:30:00 +0000 (14:30 +0000)]
Merge "Deprecate QNS network disable reason BAD_LINK" into nyc-mr1-dev
am:
dd056b9422
Change-Id: Id8e4b7666b0ff65ced28a4b53ff85dbba5a1ae17
Randy Pan [Tue, 23 Aug 2016 14:29:35 +0000 (14:29 +0000)]
Deprecate QNS network disable reason BAD_LINK
am:
7d82f98b8f
Change-Id: Ic3a92aaed8a56cf61c6bd100811bafb009613daa
Makoto Onuki [Tue, 23 Aug 2016 14:29:19 +0000 (14:29 +0000)]
Merge "Off-load unlocking users onto a worker thread" into nyc-mr1-dev
am:
8b47748b9c
Change-Id: I63ef0697035803b1d4caf3a5dd67e6e68791696b
Makoto Onuki [Tue, 23 Aug 2016 14:29:12 +0000 (14:29 +0000)]
Off-load unlocking users onto a worker thread
am:
085a05cd86
Change-Id: I85994decc805888099fc97bcb34119468a48a4f4
Bill Yi [Tue, 23 Aug 2016 14:29:01 +0000 (14:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
a6ec65edab -s ours
Change-Id: I65b4042f322910f40767c05eea10dc4aaf171160
Bill Yi [Tue, 23 Aug 2016 14:28:56 +0000 (14:28 +0000)]
Import translations. DO NOT MERGE
am:
653c88ed61 -s ours
Change-Id: I74b015207a3d0d2b42739558326cb50a1e852a99
Bill Yi [Tue, 23 Aug 2016 14:22:54 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
8aea3746cd -s ours
Change-Id: I1d30271721ea9549ad66d3230d54dee67713f2e1
Bill Yi [Tue, 23 Aug 2016 14:22:52 +0000 (14:22 +0000)]
Import translations. DO NOT MERGE
am:
225d865289 -s ours
Change-Id: Ibd4000f14a836183b386b6bf95a284e280431a65
Bill Yi [Tue, 23 Aug 2016 14:22:49 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
c341e0b571 -s ours
Change-Id: I08fa4baa8902af90ef3d0009b4ae451da0437803
Bill Yi [Tue, 23 Aug 2016 14:22:47 +0000 (14:22 +0000)]
Import translations. DO NOT MERGE
am:
8ac0dbea72 -s ours
Change-Id: I9d87c670c819ddaff3162b1c0f0189245db2274f
Bill Yi [Tue, 23 Aug 2016 14:22:45 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
7a944b3e5c -s ours
Change-Id: Ie65f53ea0ebe39273e70b668ee090f2eea1cb7c1
Bill Yi [Tue, 23 Aug 2016 14:22:43 +0000 (14:22 +0000)]
Import translations. DO NOT MERGE
am:
f71553f601 -s ours
Change-Id: If02dc06ed0015e3d5cd9ff737a62a66321eaf5df
Erik Kline [Tue, 23 Aug 2016 14:22:40 +0000 (14:22 +0000)]
Merge "Ensure known good state when starting." into nyc-mr1-dev
am:
e845cf22c1
Change-Id: Ic7901eebfe82855f67fd070501040829f39cb313
Erik Kline [Tue, 23 Aug 2016 14:22:38 +0000 (14:22 +0000)]
Ensure known good state when starting.
am:
703b0974e0
Change-Id: Ie79b1e4a67a4936a9c989ec6c6f2f278f4330e9a
Sailesh Nepal [Tue, 23 Aug 2016 14:22:02 +0000 (14:22 +0000)]
Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-mr1-dev
am:
5647c93e9e
Change-Id: I13512fa061612f7d6e296b8aadca825ebcad5577
Sailesh Nepal [Tue, 23 Aug 2016 14:04:30 +0000 (07:04 -0700)]
resolve merge conflicts of
ad31603 to cw-f-dev
Change-Id: I970fe17c234f9b99142980f685c3c4efee4767fc
TreeHugger Robot [Tue, 23 Aug 2016 05:17:13 +0000 (05:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:20:51 +0000 (00:20 +0000)]
Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am:
081e393103" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:20:34 +0000 (00:20 +0000)]
Merge "Only dispatch window visibility aggregation for targetSdk >= N am:
64e1ba4398" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:20:16 +0000 (00:20 +0000)]
Merge "Doc change: intl page updates for final n release. am:
e816f1f542 am:
79d9e9df2e" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:19:59 +0000 (00:19 +0000)]
Merge "Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am:
56ce19099d" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:19:41 +0000 (00:19 +0000)]
Merge "Fix wallpaper backup eligibility test am:
f7d1b5de6e" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:19:22 +0000 (00:19 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev am:
051d6b74eb -s ours" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:19:03 +0000 (00:19 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads. am:
d72b26085c -s ours" into nyc-mr1-dev
OSDN Git Service
