OSDN Git Service
Rob Carr [Tue, 23 Aug 2016 15:34:50 +0000 (15:34 +0000)]
Merge "Only allow focused window to select seamless rotation." into nyc-mr1-dev am:
7ae506260e
am:
f40e1533b5
Change-Id: Ide42f202a2bd4ae30e7bc7a8471818751e9962b9
Robert Carr [Tue, 23 Aug 2016 15:34:42 +0000 (15:34 +0000)]
Only allow focused window to select seamless rotation. am:
828ec3dc51
am:
d2bacdaf6d
Change-Id: I1c3a083f34c224f04343cbd1ae390068c686cde8
Dianne Hackborn [Tue, 23 Aug 2016 15:34:34 +0000 (15:34 +0000)]
Merge "Fix issue #
30929080: Default Assist app is set to None..." into nyc-mr1-dev am:
d6ece3e175
am:
ddca04dcbe
Change-Id: Idefe2cc12a7ad4f79ead642bd041bdd09033d7b3
Dianne Hackborn [Tue, 23 Aug 2016 15:25:00 +0000 (15:25 +0000)]
Fix issue #
30929080: Default Assist app is set to None... am:
e9563659a5
am:
5cb766a9cd
Change-Id: Ida55c001bd6f4ec0be8235b88fb806a617ed15cc
Todd Kennedy [Tue, 23 Aug 2016 15:24:57 +0000 (15:24 +0000)]
Merge "Allow permission group updates" into nyc-mr1-dev am:
ee2df0390e
am:
a09f3f28ef
Change-Id: I2ef7ea000d0cc65becb40a8ecdd9d1859758c944
Todd Kennedy [Tue, 23 Aug 2016 15:24:53 +0000 (15:24 +0000)]
Allow permission group updates am:
21bd9b824f
am:
873b0f563e
Change-Id: I387ffcb88341a112ff8a1aff3b38b32b4b65e382
Todd Kennedy [Tue, 23 Aug 2016 15:24:48 +0000 (15:24 +0000)]
Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev am:
0060d6eda1
am:
5cc6bf0ead
Change-Id: If8de2f5e7751ec1e65b7bdb499ecde0037fbec9b
Todd Kennedy [Tue, 23 Aug 2016 15:24:44 +0000 (15:24 +0000)]
Don't call into pkg mgr svc w/ lock held am:
f29d07a62a
am:
76a12e177c
Change-Id: Ic1f21fd64990a282375be7709aba79297c9dd6f9
Tenghui Zhu [Tue, 23 Aug 2016 15:15:16 +0000 (15:15 +0000)]
Merge "Correctly report the transparent region" into nyc-mr1-dev am:
f05765e3c4
am:
52feb6b956
Change-Id: I746a21537ec34285fda505a5919740ab04693b3d
Teng-Hui Zhu [Tue, 23 Aug 2016 15:15:06 +0000 (15:15 +0000)]
Correctly report the transparent region am:
f8da30dc65
am:
94a2f7e6fd
Change-Id: Ice979b549a74f1e8e59210f2b7c7e5a6f141b9f6
Salvador Martinez [Tue, 23 Aug 2016 15:14:54 +0000 (15:14 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am:
09b64ade22
am:
0c216301b6
Change-Id: Ic534d6c68c3b43d7b9bd811e257abb695d7c1874
Salvador Martinez [Tue, 23 Aug 2016 15:13:37 +0000 (15:13 +0000)]
Prevent wifi icon from disappearing am:
823cd0e35a
am:
aebce41a88
Change-Id: Ic05c1f77725904011e3cf5db44accb7c9847eefa
Rob Carr [Tue, 23 Aug 2016 15:13:04 +0000 (15:13 +0000)]
Merge "PopupWindow: Be more consistent about Gravity calculation." into nyc-mr1-dev am:
b19915bea8
am:
b97dc0a5a8
Change-Id: I3d27d8ae4e25fdb1977e6c57ee02aa80b3a8a4ef
Tenghui Zhu [Tue, 23 Aug 2016 15:03:39 +0000 (15:03 +0000)]
Merge "Update the javaDoc for VectorDrawable and AnimatedVectorDrawable" into nyc-mr1-dev am:
5cb0c13f76
am:
d4f839c477
Change-Id: Iba7c42c3284b1b4b8c3df90c82ce24723d3dfba3
Teng-Hui Zhu [Tue, 23 Aug 2016 15:03:33 +0000 (15:03 +0000)]
Update the javaDoc for VectorDrawable and AnimatedVectorDrawable am:
d64255f61d
am:
1c06a4dcc7
Change-Id: I936e99996d2b075d4c7ec12b7ed45dffd814e60c
Fan Zhang [Tue, 23 Aug 2016 15:03:29 +0000 (15:03 +0000)]
Merge "Update navup button content description when it's menu." into nyc-mr1-dev am:
bf1d4cae3b
am:
ab19598584
Change-Id: I51685602784ced9309d338c3864ef7b45d751a3f
Fan Zhang [Tue, 23 Aug 2016 15:03:24 +0000 (15:03 +0000)]
Update navup button content description when it's menu. am:
c10db985f3
am:
17dc1ad151
Change-Id: I8914aa451a545ba1e6f9999eec9deaedbf796e80
Steve McKay [Tue, 23 Aug 2016 15:03:19 +0000 (15:03 +0000)]
Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev am:
8499c13740
am:
a902d61eb6
Change-Id: I2940f8700c71a29ded2a68d43a3845e03e0b7c4e
Steve McKay [Tue, 23 Aug 2016 14:57:14 +0000 (14:57 +0000)]
Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev am:
8499c13740
am:
477c383cea
Change-Id: I876dfc2a08d3890ea02eb943c40d4769f5cf5e8a
Steve McKay [Tue, 23 Aug 2016 14:57:04 +0000 (14:57 +0000)]
DO NOT MERGE: Treat unknown tooltype as touch. am:
0c28f3bda3
am:
6c06272a12
Change-Id: Ie67b77b846c2bdc7655970c23beb725ae9adc70d
Sungmin Choi [Tue, 23 Aug 2016 14:56:56 +0000 (14:56 +0000)]
Merge "telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network" into nyc-mr1-dev am:
156d897f2e
am:
9d5514c81a
Change-Id: Ib72e47eaa6b9d7e5fa08f9df6c3b93c161d149a5
Sungmin Choi [Tue, 23 Aug 2016 14:56:52 +0000 (14:56 +0000)]
telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network am:
fd80d5482a
am:
c461691675
Change-Id: I793a3fe8baf60cdc29493c8cb9623d79a79bc120
Sanket Padawe [Tue, 23 Aug 2016 14:56:48 +0000 (14:56 +0000)]
Merge "Fix roam icon issues in Austria" into nyc-mr1-dev am:
914354f334
am:
f3f5022a7f
Change-Id: I12a8728a854d9b998c42ffa4c945b8b9ac2aa925
Sungmin Choi [Tue, 23 Aug 2016 14:53:52 +0000 (14:53 +0000)]
Fix roam icon issues in Austria am:
f8912fc489
am:
d1c8ab5566
Change-Id: I4827213efac41fa215c7096e666328b58d127e2e
Chong Zhang [Tue, 23 Aug 2016 14:53:39 +0000 (14:53 +0000)]
Merge "Make sure surface control is really valid before giving it to client" into nyc-mr1-dev am:
f9f8e82045
am:
ac2c6b307e
Change-Id: I333cf8facd448ac3993713bdd315841c7d249a0b
Chong Zhang [Tue, 23 Aug 2016 14:53:29 +0000 (14:53 +0000)]
Make sure surface control is really valid before giving it to client am:
7581cddf25
am:
d3edf1e799
Change-Id: I25cb7bb6a3f87795af75d637bf98b682197f3627
Raph Levien [Tue, 23 Aug 2016 14:53:16 +0000 (14:53 +0000)]
Merge "Update lint check to accommodate new emoji sequences" into nyc-mr1-dev am:
e7ab3e1650
am:
ddc50bb7d9
Change-Id: I8d78147b79e57a69dac679f4e571f3dc815932b1
Raph Levien [Tue, 23 Aug 2016 14:53:06 +0000 (14:53 +0000)]
Update lint check to accommodate new emoji sequences am:
0790ac68bc
am:
b1581dbbfd
Change-Id: I17b2989e1ee0477991705d15e0324a449da69c1a
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
Randy Pan [Tue, 23 Aug 2016 14:45:26 +0000 (14:45 +0000)]
Merge "Deprecate QNS network disable reason BAD_LINK" into nyc-mr1-dev am:
dd056b9422
am:
69f7492184
Change-Id: I6711a9fac55cbc20f8f7f3511200e4f668334752
Randy Pan [Tue, 23 Aug 2016 14:44:20 +0000 (14:44 +0000)]
Deprecate QNS network disable reason BAD_LINK am:
7d82f98b8f
am:
1f7453e79c
Change-Id: I187eac64a1b7b2582a5b0ce2b5d8775bbb1299a9
Makoto Onuki [Tue, 23 Aug 2016 14:44:14 +0000 (14:44 +0000)]
Merge "Off-load unlocking users onto a worker thread" into nyc-mr1-dev am:
8b47748b9c
am:
9594d78a45
Change-Id: I612522eb78c92f9eb677049aaef61728318256ca
Makoto Onuki [Tue, 23 Aug 2016 14:44:11 +0000 (14:44 +0000)]
Off-load unlocking users onto a worker thread am:
085a05cd86
am:
035cfcd21d
Change-Id: Ie19ee16803beb4f11011ea5833c9a80dc22d82d7
Bill Yi [Tue, 23 Aug 2016 14:44:07 +0000 (14:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a6ec65edab -s ours
am:
125d6479a0 -s ours
Change-Id: Ic316efc26417c8915b4531b17d632b5b05a88d62
Bill Yi [Tue, 23 Aug 2016 14:44:04 +0000 (14:44 +0000)]
Import translations. DO NOT MERGE am:
653c88ed61 -s ours
am:
85755a910e -s ours
Change-Id: I7990c75216b72ed76a7fe10aa0ecc590acc2da0e
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
Bill Yi [Tue, 23 Aug 2016 14:35:25 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
8aea3746cd -s ours
am:
d6e2c3ff06 -s ours
Change-Id: Ie89dab313c94a48e20d5094acd740ebd7fbcee72
Bill Yi [Tue, 23 Aug 2016 14:35:21 +0000 (14:35 +0000)]
Import translations. DO NOT MERGE am:
225d865289 -s ours
am:
a5b32eb046 -s ours
Change-Id: Ib2379f9ca6b32ee0aee79084cf105a0d7dcd6401
Bill Yi [Tue, 23 Aug 2016 14:35:18 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
c341e0b571 -s ours
am:
b19043ff85 -s ours
Change-Id: Ideb32bda0a357e2f92a895770ac7f717984ebd77
Bill Yi [Tue, 23 Aug 2016 14:35:15 +0000 (14:35 +0000)]
Import translations. DO NOT MERGE am:
8ac0dbea72 -s ours
am:
71cd2b8449 -s ours
Change-Id: Iabc086baba62887c4c8f619d8b59b4e66b9fba47
Bill Yi [Tue, 23 Aug 2016 14:32:19 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
7a944b3e5c -s ours
am:
99c97f5fb4 -s ours
Change-Id: I3e7fa778fcf551e16500950cffad895da228888f
Bill Yi [Tue, 23 Aug 2016 14:32:15 +0000 (14:32 +0000)]
Import translations. DO NOT MERGE am:
f71553f601 -s ours
am:
e8fd4589f1 -s ours
Change-Id: I8b094a9a7b49b0397285d08ee6d550c829c3d3d3
Erik Kline [Tue, 23 Aug 2016 14:32:12 +0000 (14:32 +0000)]
Merge "Ensure known good state when starting." into nyc-mr1-dev am:
e845cf22c1
am:
31ef78878e
Change-Id: I29381e3438229a0d628a6017cd8bf143c55457f3
Erik Kline [Tue, 23 Aug 2016 14:32:09 +0000 (14:32 +0000)]
Ensure known good state when starting. am:
703b0974e0
am:
226db19739
Change-Id: I9193adfa93d3de8b3a9ddfcb73814a938814ee63
Sailesh Nepal [Tue, 23 Aug 2016 14:32:04 +0000 (14:32 +0000)]
Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-mr1-dev am:
5647c93e9e
am:
7aaa861cd7
Change-Id: Ibffd6c32c383039e6d066533d65e5531740fe06a
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:15:31 +0000 (14:15 +0000)]
resolve merge conflicts of
ad31603 to cw-f-dev
am:
bbfb97461d
Change-Id: I8c497533297df55ef4aac85ca2d0d981a057b9d4
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
Bill Yi [Tue, 23 Aug 2016 05:21:17 +0000 (05:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
5ab8b4e75d -s ours
Change-Id: Ibe0e85d697ac3374ece05c773bd95f42db292eda
Bill Yi [Tue, 23 Aug 2016 05:21:13 +0000 (05:21 +0000)]
Import translations. DO NOT MERGE
am:
8213e7afca -s ours
Change-Id: I2d87f3873ddf1591e605e3e0dd5b127229691d61
TreeHugger Robot [Tue, 23 Aug 2016 05:17:13 +0000 (05:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Yang Ni [Tue, 23 Aug 2016 01:43:46 +0000 (01:43 +0000)]
Updated user document for Single-Source RenderScript am:
c069ed7f8c
am:
460c01f2ec
Change-Id: I30fe31d4b9cfe6e11d224523d2d9384171092bb3
Yang Ni [Tue, 23 Aug 2016 01:38:48 +0000 (01:38 +0000)]
Updated user document for Single-Source RenderScript
am:
c069ed7f8c
Change-Id: Id8c3c8d22ea6edd78d1d5d95070cfd0ae8b112a2
Rob Carr [Mon, 22 Aug 2016 23:53:01 +0000 (23:53 +0000)]
Merge "Only allow focused window to select seamless rotation." into nyc-mr1-dev
Yang Ni [Wed, 29 Jun 2016 19:44:06 +0000 (12:44 -0700)]
Updated user document for Single-Source RenderScript
Bug:
29875503
Bug:
29879448
Added a section introducing the new single-source feature.
Local staging:
http://yangni.mtv.corp.google.com/guide/topics/renderscript/compute.html
This updates
https://developer.android.com/guide/topics/renderscript/compute.html
Change-Id: I62dda3ab60b1678a9580fd2873f64f33d9696e13
Dianne Hackborn [Mon, 22 Aug 2016 23:22:57 +0000 (23:22 +0000)]
Merge "Fix issue #
30929080: Default Assist app is set to None..." into nyc-mr1-dev
Todd Kennedy [Mon, 22 Aug 2016 23:18:46 +0000 (23:18 +0000)]
Merge "Allow permission group updates" into nyc-mr1-dev
Todd Kennedy [Mon, 22 Aug 2016 23:17:20 +0000 (23:17 +0000)]
Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev
Bill Yi [Mon, 22 Aug 2016 22:29:51 +0000 (15:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I18cf83300428bd340ee2a13f908343dc05ab9f76
Auto-generated-cl: translation import
Nick Vaccaro [Mon, 22 Aug 2016 22:05:40 +0000 (22:05 +0000)]
Merge "Fix some potential power-draining race conditions" into cw-f-dev
am:
efc2c764f1
Change-Id: I772ae4e186332d1fc13a694c3c7e61fbbc6ac1d3