OSDN Git Service
Bill Yi [Tue, 25 Oct 2016 06:35:40 +0000 (06:35 +0000)]
Import translations. DO NOT MERGE am:
6d512da8e7 -s ours
am:
8f8f7cc918 -s ours
Change-Id: Ica051b105781401aeedb5a89abaac033a7184b61
Bill Yi [Tue, 25 Oct 2016 06:34:24 +0000 (06:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
44ee15db41 -s ours
Change-Id: Ie4475bcf0b48b0297748d0f527d6fc707c2fd3dc
Bill Yi [Tue, 25 Oct 2016 06:34:20 +0000 (06:34 +0000)]
Import translations. DO NOT MERGE
am:
07e46a5d46 -s ours
Change-Id: I970027fabb814e91ae0a07ff9869b17bec5c3099
Bill Yi [Tue, 25 Oct 2016 06:28:33 +0000 (06:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
46f6582d84 -s ours
Change-Id: Ibec3557681ab54be71109d728121b13a6a5df182
Bill Yi [Tue, 25 Oct 2016 06:28:28 +0000 (06:28 +0000)]
Import translations. DO NOT MERGE
am:
6744706608 -s ours
Change-Id: I6dfb62713943ebeacb5a725d9234fde3b9f97e0c
Bill Yi [Tue, 25 Oct 2016 06:27:48 +0000 (06:27 +0000)]
Import translations. DO NOT MERGE
am:
6d512da8e7 -s ours
Change-Id: I01407ceed1d3f8a28b956e156100adc6960f61f4
TreeHugger Robot [Tue, 25 Oct 2016 06:22:03 +0000 (06:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:21:14 +0000 (06:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 25 Oct 2016 04:32:32 +0000 (21:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb57ea645fd79e4cf96c8ca8a1c911a3dd7e761c
Auto-generated-cl: translation import
Lifu Tang [Tue, 25 Oct 2016 04:30:18 +0000 (04:30 +0000)]
Merge "Fix GNSS status delivery to the callbacks" into nyc-mr1-dev am:
14bd8017fa am:
70462bd723
am:
2c5895fd4a
Change-Id: I48c3b32c36cbfa8f42bba6c27ebe14a3424b2c19
Lifu Tang [Tue, 25 Oct 2016 04:29:19 +0000 (04:29 +0000)]
Fix GNSS status delivery to the callbacks am:
4e82fe5120 am:
1e785cd045
am:
1d5042c907
Change-Id: If202cdca2f62b89eac8346cc17b18ad7639a5891
Lifu Tang [Tue, 25 Oct 2016 04:23:39 +0000 (04:23 +0000)]
Merge "Fix GNSS status delivery to the callbacks" into nyc-mr1-dev am:
14bd8017fa
am:
70462bd723
Change-Id: I75313027cc6f0089e3da88850e95873bfa7f175f
Lifu Tang [Tue, 25 Oct 2016 04:22:45 +0000 (04:22 +0000)]
Fix GNSS status delivery to the callbacks am:
4e82fe5120
am:
1e785cd045
Change-Id: If39f545926b4b18f78737c3c00c668508a55b297
Lifu Tang [Tue, 25 Oct 2016 04:16:59 +0000 (04:16 +0000)]
Merge "Fix GNSS status delivery to the callbacks" into nyc-mr1-dev
am:
14bd8017fa
Change-Id: I48f6855f6897beb4268b444fb7842939667b2ca9
Lifu Tang [Tue, 25 Oct 2016 04:16:56 +0000 (04:16 +0000)]
Fix GNSS status delivery to the callbacks
am:
4e82fe5120
Change-Id: I5b84890c87bf5742448a772ed358ef6352cb1640
Bill Yi [Tue, 25 Oct 2016 04:16:42 +0000 (21:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I82aab2fcdb95ad0718ea1d4b6c041a36be0e77ee
Auto-generated-cl: translation import
Lifu Tang [Tue, 25 Oct 2016 04:10:44 +0000 (04:10 +0000)]
Merge "Fix GNSS status delivery to the callbacks" into nyc-mr1-dev
nharold [Tue, 25 Oct 2016 01:11:02 +0000 (01:11 +0000)]
Merge "Update the docstring on getAllCellInfo() for unreported values" am:
88d0a95c74 am:
b7e5c6fa32
am:
c8fceb9834
Change-Id: Iba303da06ad35991a610aaf554fbd428cc90ca9e
nharold [Tue, 25 Oct 2016 01:06:07 +0000 (01:06 +0000)]
Merge "Update the docstring on getAllCellInfo() for unreported values" am:
88d0a95c74
am:
b7e5c6fa32
Change-Id: Ie5f6460962fac98bd63aa7b7d4e77e5bc84347e7
nharold [Tue, 25 Oct 2016 00:57:36 +0000 (00:57 +0000)]
Merge "Update the docstring on getAllCellInfo() for unreported values"
am:
88d0a95c74
Change-Id: Ib482a5398776473ccb97c4df96115fc3763c782f
nharold [Tue, 25 Oct 2016 00:48:40 +0000 (00:48 +0000)]
Merge "Update the docstring on getAllCellInfo() for unreported values"
George French [Tue, 25 Oct 2016 00:43:36 +0000 (00:43 +0000)]
docs: Update startService() & bindService() documentation (Proj13) am:
9748d76be9 am:
e8e196d007 am:
d544dc785b am:
5d1af7d918
am:
511fdef6c5
Change-Id: I35750a7e88fee139b40359210086467eec3a5c48
George French [Tue, 25 Oct 2016 00:36:34 +0000 (00:36 +0000)]
docs: Update startService() & bindService() documentation (Proj13) am:
9748d76be9 am:
e8e196d007 am:
d544dc785b
am:
5d1af7d918
Change-Id: I7ee574ff28491470cea4f1071c82d473fc07ad85
George French [Tue, 25 Oct 2016 00:30:01 +0000 (00:30 +0000)]
docs: Update startService() & bindService() documentation (Proj13) am:
9748d76be9 am:
e8e196d007
am:
d544dc785b
Change-Id: I3289a55caaeadd267063916bcdc8e4851327381b
George French [Tue, 25 Oct 2016 00:26:05 +0000 (00:26 +0000)]
docs: Update startService() & bindService() documentation (Proj13) am:
9748d76be9
am:
e8e196d007
Change-Id: I3d804611d1290eb6cf0fa525e492864220fb85fa
George French [Tue, 25 Oct 2016 00:19:33 +0000 (00:19 +0000)]
docs: Update startService() & bindService() documentation (Proj13)
am:
9748d76be9
Change-Id: I976128eb4c14ee2587c9cfa9c34f4b3dc006aa38
Nathan Harold [Mon, 24 Oct 2016 18:24:16 +0000 (11:24 -0700)]
Update the docstring on getAllCellInfo() for unreported values
In the event that not all fields are available for a particular
cell information report, those values are set to
Integer.MAX_VALUE. In addition, this docstring clarifies the
minimum expectation for what will be reported in all cases.
Bug:
32364031
Test: none
Change-Id: Ic5df72f69e5917eb495d349a380ced53a80408fa
Bill Yi [Mon, 24 Oct 2016 22:55:26 +0000 (15:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2be2e9036cfae41141574a37a69d76491eb1cb6a
Auto-generated-cl: translation import
Lifu Tang [Mon, 24 Oct 2016 20:33:47 +0000 (13:33 -0700)]
Fix GNSS status delivery to the callbacks
Bug:
32357457
Change-Id: I8f2b8dae5472cb81313417e85c092dca0aae5bd9
George French [Wed, 7 Sep 2016 16:59:32 +0000 (09:59 -0700)]
docs: Update startService() & bindService() documentation (Proj13)
Updated Update startService() and bindService() docs to mention that they
no longer support implicit intent. And mentioned that the Intellegent
job scheduling is now the preferred method for launching services.
We also performed a copy edit, implementing Google styles.
Bug:
18333456
Change-Id: I2b2ec666be870aea15045d30fbc822256d1b9a81
Yoshinori Hirano [Mon, 24 Oct 2016 18:43:10 +0000 (18:43 +0000)]
Merge "Allow operator/manufacturer setting to use priority" am:
aef1a557aa am:
4244d53c3e
am:
0be36ac0d1
Change-Id: I24b4d5ef74540cba4c90a134615eadd82b1c4a62
Yoshinori Hirano [Mon, 24 Oct 2016 18:39:22 +0000 (18:39 +0000)]
Merge "Allow operator/manufacturer setting to use priority" am:
aef1a557aa
am:
4244d53c3e
Change-Id: Ia6fcaa0550f2e1bb74f61d547fcd39de3b95fe90
Yoshinori Hirano [Mon, 24 Oct 2016 18:32:14 +0000 (18:32 +0000)]
Merge "Allow operator/manufacturer setting to use priority"
am:
aef1a557aa
Change-Id: I81ccdc0910ab5298d5b54f3b8e390262d02225ea
Treehugger Robot [Mon, 24 Oct 2016 18:21:06 +0000 (18:21 +0000)]
Merge "Allow operator/manufacturer setting to use priority"
Mark Salyzyn [Mon, 24 Oct 2016 16:06:03 +0000 (16:06 +0000)]
Merge "PdfEditor: define LOG_TAG" am:
a3bb8e3cc7 am:
9c0ea2d1cd
am:
5aad37e70c
Change-Id: I63b9ad911207f535c358cfd422a9b2990254de95
Mark Salyzyn [Mon, 24 Oct 2016 15:59:34 +0000 (15:59 +0000)]
Merge "PdfEditor: define LOG_TAG" am:
a3bb8e3cc7
am:
9c0ea2d1cd
Change-Id: I61d351dd5b83e598fd59efbe9f414166a685fef7
Mark Salyzyn [Mon, 24 Oct 2016 15:53:30 +0000 (15:53 +0000)]
Merge "PdfEditor: define LOG_TAG"
am:
a3bb8e3cc7
Change-Id: Ide63ebe4228d7b7af05e20202baafdebf9699150
Treehugger Robot [Mon, 24 Oct 2016 15:47:32 +0000 (15:47 +0000)]
Merge "PdfEditor: define LOG_TAG"
Shigeki Yokomichi [Mon, 24 Oct 2016 14:35:29 +0000 (14:35 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" am:
f741f88284 am:
e79cb5c81d
am:
77fc19fa8e
Change-Id: I477db42ff85d52c07f29b844d7d251ce631251cd
Shigeki Yokomichi [Mon, 24 Oct 2016 14:28:23 +0000 (14:28 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" am:
f741f88284
am:
e79cb5c81d
Change-Id: I45c03d29bec22b59decb7c95bc1464dd83094c90
Shigeki Yokomichi [Mon, 24 Oct 2016 14:21:25 +0000 (14:21 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter"
am:
f741f88284
Change-Id: I64701d06c2e15b0ad11018c233fce32dce1caa52
Treehugger Robot [Mon, 24 Oct 2016 14:09:35 +0000 (14:09 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter"
Shigeki Yokomichi [Wed, 12 Oct 2016 09:35:17 +0000 (18:35 +0900)]
Avoid NPE around mReusedTask of ActivityStarter
Symptom:
System crash by NPE is observed on ActivityStarter
during phone boot-up.
Detail and sample:
ActivityStarter has possibility to be called itself recursively
by calling TaskRecord$performClearTaskLocked().
Then class variable of mReusedTask is initialized to null
after the call, because the recursive call isn't guarded by
synchronized block.
Then NPE crash occurs on next statement.
Solutions:
Avoid to use the class variable on null possibility statement.
Bug:
32361138
Change-Id: Iaea3e066a6f7134fcae4338ff864bb236241194c
Pankaj Kanwar [Mon, 24 Oct 2016 02:20:20 +0000 (02:20 +0000)]
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev am:
9cac4568e5
am:
0d75ccf006
Change-Id: I7c147cf575e1040a82a7fe05a97a45e06108b010
Lorenzo Colitti [Mon, 24 Oct 2016 02:19:19 +0000 (02:19 +0000)]
CaptivePortalLogin: set mixed content policy to compatibility. am:
625166377b
am:
c9f79b3d1e
Change-Id: I8430e6190e2c6170a00c6b8106416ca5801671db
Pankaj Kanwar [Mon, 24 Oct 2016 02:13:18 +0000 (02:13 +0000)]
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
am:
9cac4568e5
Change-Id: I6b1d09378a0a9a82c0ac397ed920ae633232f044
Lorenzo Colitti [Mon, 24 Oct 2016 02:13:15 +0000 (02:13 +0000)]
CaptivePortalLogin: set mixed content policy to compatibility.
am:
625166377b
Change-Id: I536b2f5a80d3ceaed0ffa86501f6d60e2a407641
Pankaj Kanwar [Mon, 24 Oct 2016 02:02:48 +0000 (02:02 +0000)]
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
Bill Yi [Sat, 22 Oct 2016 11:55:18 +0000 (11:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
496d17f748 -s ours
am:
0f106f5744 -s ours
Change-Id: Ibab00657197612ed30ac08888826e3a7e132f5ad
Bill Yi [Sat, 22 Oct 2016 11:54:15 +0000 (11:54 +0000)]
Import translations. DO NOT MERGE am:
300ad2e4b0 -s ours
am:
adfb58ac37 -s ours
Change-Id: I661ecca9565772febd4fb26027187de687d6e194
Bill Yi [Sat, 22 Oct 2016 11:49:18 +0000 (11:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d849122bbb -s ours
am:
e7bdd3679c -s ours
Change-Id: I0e7e7ccc36bb09246869c9eb7c4351ff44888458
Bill Yi [Sat, 22 Oct 2016 11:48:17 +0000 (11:48 +0000)]
Import translations. DO NOT MERGE am:
39eb3b4ac2 -s ours
am:
28fbde286d -s ours
Change-Id: Ib6de23cd75229a335ad8d318b6acc26d5c2da0b4
Bill Yi [Sat, 22 Oct 2016 11:47:00 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
be30f0d5ea -s ours
Change-Id: I9d5c804341cf0ced313b8a82db933975b1089775
Bill Yi [Sat, 22 Oct 2016 11:46:56 +0000 (11:46 +0000)]
Import translations. DO NOT MERGE
am:
8758da732f -s ours
Change-Id: I574899dc90e63b25b249c75dfde0e87c7b590621
Bill Yi [Sat, 22 Oct 2016 11:45:36 +0000 (11:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
0cb41b80af -s ours
Change-Id: I9dd31230b3ee011d36e1324c4ab279cf30ef34c5
Bill Yi [Sat, 22 Oct 2016 11:45:32 +0000 (11:45 +0000)]
Import translations. DO NOT MERGE
am:
c27fdce39f -s ours
Change-Id: I0e59e72f0b24f846472adf0b20098fcd9ae4359a
Bill Yi [Sat, 22 Oct 2016 11:42:09 +0000 (11:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
496d17f748 -s ours
Change-Id: I3c4017b2b089fafacf6b6951ca62da054363827f
Bill Yi [Sat, 22 Oct 2016 11:42:07 +0000 (11:42 +0000)]
Import translations. DO NOT MERGE
am:
300ad2e4b0 -s ours
Change-Id: I6ecb8388aa2baa4733d75cee4628397e9d68e586
Bill Yi [Sat, 22 Oct 2016 11:40:52 +0000 (11:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
d849122bbb -s ours
Change-Id: I8612211ea13a7f66963d2b378db3e5c3049a6c72
Bill Yi [Sat, 22 Oct 2016 11:40:50 +0000 (11:40 +0000)]
Import translations. DO NOT MERGE
am:
39eb3b4ac2 -s ours
Change-Id: If06e606ce2c9ad83c680154bc7e5a8bd80af5207
TreeHugger Robot [Sat, 22 Oct 2016 11:36:41 +0000 (11:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sat, 22 Oct 2016 11:35:33 +0000 (11:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sat, 22 Oct 2016 11:33:13 +0000 (11:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Sat, 22 Oct 2016 11:32:49 +0000 (11:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Sat, 22 Oct 2016 08:11:45 +0000 (01:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia238fb87c9c8be76cbadfbec1956b629414a3c48
Auto-generated-cl: translation import
Bill Yi [Sat, 22 Oct 2016 07:52:51 +0000 (00:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3d5eae9008ead575fda0db5acbd233b4a9cf7273
Auto-generated-cl: translation import
Julius D'souza [Sat, 22 Oct 2016 04:05:59 +0000 (04:05 +0000)]
Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev
am:
e2590cccfd
Change-Id: I887432053d2503cf542ad3106ab915a0d4f3998f
Julius D'souza [Sat, 22 Oct 2016 04:05:52 +0000 (04:05 +0000)]
DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples
am:
a2b07dc8d9
Change-Id: I1cc70bcb8dc946ab72f1ce5dd0b126d613d90d44
Julius D'souza [Sat, 22 Oct 2016 04:04:28 +0000 (04:04 +0000)]
Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev
am:
e88cbbf40d
Change-Id: I82350ac6ce99890d30542b7616dac8579eed0413
Julius D'souza [Sat, 22 Oct 2016 04:04:22 +0000 (04:04 +0000)]
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"
am:
4fff94f1ed
Change-Id: I3ce3d2b2af4be23fe9b57b907ef6db280543acbc
Julius D'souza [Sat, 22 Oct 2016 03:58:25 +0000 (03:58 +0000)]
Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev
Julius D'souza [Sat, 22 Oct 2016 03:57:59 +0000 (03:57 +0000)]
Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev
Robert Sesek [Sat, 22 Oct 2016 03:17:15 +0000 (03:17 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit." am:
8be2850546
am:
f80fab010a
Change-Id: I37d0d62662ee96a9eefe2dfa71670d8e4b724889
Robert Sesek [Sat, 22 Oct 2016 03:12:18 +0000 (03:12 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
am:
8be2850546
Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a
Treehugger Robot [Sat, 22 Oct 2016 03:03:10 +0000 (03:03 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
Bill Yi [Sat, 22 Oct 2016 02:45:18 +0000 (19:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7564aa066446c6332e6cca5868905a8f05850fcc
Auto-generated-cl: translation import
Jason Monk [Sat, 22 Oct 2016 02:37:21 +0000 (02:37 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev am:
9db47b0f49
am:
e28705ac90
Change-Id: I67337d3d11b2c21175ad64a2c841191b40127d78
Bill Yi [Sat, 22 Oct 2016 02:37:08 +0000 (19:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4c1c1777ee5b308a1632fe4dc6973d94378e55fe
Auto-generated-cl: translation import
Jason Monk [Sat, 22 Oct 2016 02:36:16 +0000 (02:36 +0000)]
Fix vpn branded string usage am:
59474a40af
am:
ec421cd433
Change-Id: I2dade8df4b700b244308e66d2d546b6d866a7260
Jason Monk [Sat, 22 Oct 2016 02:30:53 +0000 (02:30 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev
am:
9db47b0f49
Change-Id: Ie3a6a3840bf047e8ba6126e563c93cba374b4d8e
Jason Monk [Sat, 22 Oct 2016 02:30:51 +0000 (02:30 +0000)]
Fix vpn branded string usage
am:
59474a40af
Change-Id: Ie6945d5978394024ae2f06edb29c38a18459e504
TreeHugger Robot [Sat, 22 Oct 2016 02:23:04 +0000 (02:23 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev
Julius D'souza [Sat, 22 Oct 2016 02:16:47 +0000 (19:16 -0700)]
DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples
Bug:
32169300
Change-Id: If7eb443bc7c4bcc21eb4bc317f4fcd1219e9e25b
Julius D'souza [Sat, 22 Oct 2016 02:21:01 +0000 (02:21 +0000)]
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"
This reverts commit
637ae798ccd8762b6e53fcdfdf1aec6c3c8cf23a.
Change-Id: I1c7b449a2b13d5d3d956ac0570cb14b49c2e8b2c
Jeremy Joslin [Fri, 21 Oct 2016 23:43:06 +0000 (23:43 +0000)]
VPN network stat accounting changes. am:
3f0d75afe8
am:
0d309b7a47
Change-Id: I797ac586581f83ada0e94639dd435122c987f1c1
Jeremy Joslin [Fri, 21 Oct 2016 23:37:57 +0000 (23:37 +0000)]
VPN network stat accounting changes.
am:
3f0d75afe8
Change-Id: I1c65db583cdd1d5b519830e521c633cb8dee449f
Jason Monk [Fri, 21 Oct 2016 23:27:34 +0000 (19:27 -0400)]
Fix vpn branded string usage
Change-Id: I42fdca60536425c757759414ac812b20e0b42823
Fixes:
32071681
Julius D'souza [Fri, 21 Oct 2016 22:37:04 +0000 (22:37 +0000)]
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev
am:
a39e64eac2
Change-Id: I76a3334bd1464d9d8591f4bf1bbe369d90753d5e
Julius D'souza [Fri, 21 Oct 2016 22:36:58 +0000 (22:36 +0000)]
DO NOT MERGE: Disable dim brightness reset when using ALS-based doze
am:
637ae798cc
Change-Id: I3c2045d253a75d9afcf8771a503188c47d8de49d
Julius D'souza [Fri, 21 Oct 2016 22:29:33 +0000 (22:29 +0000)]
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev
Julius D'souza [Fri, 21 Oct 2016 21:06:28 +0000 (14:06 -0700)]
DO NOT MERGE: Disable dim brightness reset when using ALS-based doze
Bug:
32169300
Change-Id: I60d23405eb38ec0625b5b7f739a84918f4632359
Android Build Merger (Role) [Fri, 21 Oct 2016 21:19:31 +0000 (21:19 +0000)]
Merge "Merge "Camera2 Legacy: catch more surface abandoned error" am:
03f14bef41 am:
50f9b6e71f" into nyc-mr1-dev-plus-aosp
Yin-Chia Yeh [Fri, 21 Oct 2016 21:18:48 +0000 (21:18 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error" am:
03f14bef41
am:
50f9b6e71f
Change-Id: I1da99a15ab8ff08d3f9ccb0e9408990ad60ff279
Vinod Krishnan [Fri, 21 Oct 2016 21:17:48 +0000 (21:17 +0000)]
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev
am:
088f73a9e9
Change-Id: Icbea8fbdefbf9979b72b7babac10e28a336d7d2f
Vinod Krishnan [Fri, 21 Oct 2016 21:14:19 +0000 (21:14 +0000)]
Fwk: Only chime when docked and accessbility is on
am:
cf11ceab65
Change-Id: Ief29ef6f325a8248843faa9fbe9ae6ff893a6918
Michael Kwan [Fri, 21 Oct 2016 21:11:25 +0000 (21:11 +0000)]
Merge "Fix improperly laid out alert dialog title to match UX specs." into cw-f-dev
am:
243e966892
Change-Id: I9f3ae90d6ecce4c2944faad3f6f9b95642469935
Michael Kwan [Fri, 21 Oct 2016 21:11:17 +0000 (21:11 +0000)]
Fix improperly laid out alert dialog title to match UX specs.
am:
9c86e68bfa
Change-Id: I0989366635ebeb4af6ca63cc42c50913c2b7d32a
Yin-Chia Yeh [Fri, 21 Oct 2016 21:07:44 +0000 (21:07 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error"
am:
03f14bef41
Change-Id: If2e05eeb8c7fe24f97fc0c5e20bfe03a6c8c9e23
TreeHugger Robot [Fri, 21 Oct 2016 20:41:07 +0000 (20:41 +0000)]
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev
Michael Kwan [Fri, 21 Oct 2016 20:38:02 +0000 (20:38 +0000)]
Merge "Fix improperly laid out alert dialog title to match UX specs." into cw-f-dev
OSDN Git Service
