Commit Graph

258324 Commits

Author SHA1 Message Date
Manu Cornet
925d862656 Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev 2017-02-06 22:38:34 +00:00
Ricardo Loo
d27f7a7af7 Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am: 19dae584ba
am: b06c3ed79e

Change-Id: I97f1b4559b0c8d4eb3709a455e54157fe3a40426
2017-02-06 20:50:48 +00:00
Ricardo Loo
94122af913 docs: Update gluUnProject parameter description. am: 232c4900ac
am: cb6a5fc0f3

Change-Id: Ied7be460f12d29dd1ce77be724c11b78e2179293
2017-02-06 20:49:49 +00:00
Ricardo Loo
b06c3ed79e Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev
am: 19dae584ba

Change-Id: I401682a35913ed936d124f7265e3e9338335ccee
2017-02-06 20:45:27 +00:00
Ricardo Loo
cb6a5fc0f3 docs: Update gluUnProject parameter description.
am: 232c4900ac

Change-Id: I087f08225229483798997096be428ef89f61d0bb
2017-02-06 20:45:23 +00:00
Ricardo Loo
19dae584ba Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev 2017-02-06 20:37:46 +00:00
Agnieszka Madurska
a09e108f65 Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev
am: 16edc46ca3

Change-Id: Idb27cb8e19376e11f7ec2e9366c50c8d382cf8ba
2017-02-06 19:37:03 +00:00
Aga Madurska
50bc6a1998 Use correct APIs to detect conditions for round scrollbars.
am: 99485ef841

Change-Id: I8301a27b03d1ba64e48064057f112ebaf38eb6c2
2017-02-06 19:37:00 +00:00
Agnieszka Madurska
16edc46ca3 Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev 2017-02-06 19:30:31 +00:00
Pavel Grafov
57f2ed0757 Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a
am: 1f8f29968b

Change-Id: Ib43072f8a6d35c4e297493f49386aafed53a609a
2017-02-06 17:47:10 +00:00
Pavel Grafov
1bb00e0849 Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31
am: fca679ff74

Change-Id: I9f02c30450e56b8f25bbbe4b1baa2381c84437c8
2017-02-06 17:46:09 +00:00
Pavel Grafov
1f8f29968b Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev
am: 504ca8e41a

Change-Id: I9f880a65827d689aa379ff54138f54422048a59c
2017-02-06 17:41:12 +00:00
Pavel Grafov
fca679ff74 Fix the documentation for SecurityLog.SecurityEvent.getData().
am: 739cda8f31

Change-Id: I0c6f1271392bfc9cc8d253d5fa5e029213492b48
2017-02-06 17:41:08 +00:00
Pavel Grafov
504ca8e41a Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev 2017-02-06 17:35:09 +00:00
Aga Madurska
99485ef841 Use correct APIs to detect conditions for round scrollbars.
Bug: 34876394

Test: Performed manually.

Change-Id: I9e690e99fd8d925c589ebd19d9c6754eeb63b1d8
2017-02-06 12:33:36 +00:00
Ricardo Loo
232c4900ac docs: Update gluUnProject parameter description.
Adding missing variable in the output vector.

Originally reported in
http://code.google.com/p/android/issues/detail?id=25143

Change-Id: I91d9ce7e53a9d9cdd890899a0edd49830d533b9b

Bug: 5991013
2017-02-03 18:40:27 -06:00
TreeHugger Robot
7acceb8746 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-03 08:57:23 +00:00
TreeHugger Robot
d46d030238 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-03 08:10:55 +00:00
TreeHugger Robot
b2d152ee90 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-03 08:10:36 +00:00
TreeHugger Robot
362113588f Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-03 08:10:02 +00:00
TreeHugger Robot
e2d9a7fef5 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-03 08:09:42 +00:00
TreeHugger Robot
a9d4a2cdc5 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-03 08:09:07 +00:00
TreeHugger Robot
18891008dc Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-03 08:08:35 +00:00
TreeHugger Robot
ec47322af8 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-03 08:08:10 +00:00
TreeHugger Robot
c3d842df73 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-03 08:06:44 +00:00
Bill Yi
49a9d35eb7 Import translations. DO NOT MERGE
Change-Id: I048f56389089e4ddda39477a10c935dd5ed00552
Auto-generated-cl: translation import
2017-02-02 23:13:19 -08:00
Bill Yi
9b11a3cea8 Import translations. DO NOT MERGE
Change-Id: I0292d15f9ce58b6ae589e9901155dc233da8994e
Auto-generated-cl: translation import
2017-02-02 20:27:50 -08:00
Bill Yi
8c97416258 Import translations. DO NOT MERGE
Change-Id: I4fd53e32bdd8da20d93cd2800fce5bb007c2f5ad
Auto-generated-cl: translation import
2017-02-02 19:57:19 -08:00
Bill Yi
62c95279e2 Import translations. DO NOT MERGE
Change-Id: I96c4934556779581110e0e625dd69604f33ea624
Auto-generated-cl: translation import
2017-02-02 19:53:39 -08:00
Bill Yi
ba8e772bbe Import translations. DO NOT MERGE
Change-Id: Ib30b732ba934a3d301d1763dca7642f4c5a9e83a
Auto-generated-cl: translation import
2017-02-02 19:50:14 -08:00
Bill Yi
b2d808b3f3 Import translations. DO NOT MERGE
Change-Id: Ic396f6c902a55fc4a5d0e2246c5e6be7a6a310eb
Auto-generated-cl: translation import
2017-02-02 19:47:04 -08:00
Bill Yi
37093ca19c Import translations. DO NOT MERGE
Change-Id: Ica7657382bbe34cb849b6bc07b6bc3f92b04049a
Auto-generated-cl: translation import
2017-02-02 19:30:38 -08:00
Bill Yi
31423f28b7 Import translations. DO NOT MERGE
Change-Id: Ic4421f63eb2837c54e32b25ddc7160ab50faa308
Auto-generated-cl: translation import
2017-02-02 19:19:09 -08:00
Bill Yi
f812207041 Import translations. DO NOT MERGE
Change-Id: I0ce933b5ea5d86252fad10b0e6aedcd88b57f87f
Auto-generated-cl: translation import
2017-02-02 19:15:46 -08:00
Jeff Sharkey
0387fd89f2 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c
am: 34df10ec98

Change-Id: I74e19a0c1a310084ca5785ed8d8bc5988cce2258
2017-02-03 01:30:51 +00:00
Jeff Sharkey
87ae27b020 DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596 am: 6f47221263 am: 47bfa0ab25
am: 6cfa84791d

Change-Id: Idd62b3a72d5f8daf403100c6a6150b5792c00de7
2017-02-03 01:30:01 +00:00
Jeff Sharkey
0792846ea5 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd
am: ce15555148

Change-Id: Iae6d62ce80959214aac7299ff1077a54d69e03b5
2017-02-03 01:28:54 +00:00
Jeff Sharkey
b93bc585f0 DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a
am: 8c23d1aadb

Change-Id: I78fd2fdabdbaf2d10f930a0ccc46cb9380b4b5ad
2017-02-03 01:25:30 +00:00
Jeff Sharkey
34df10ec98 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2
am: 5a50d2b12c

Change-Id: I32bf2850fe25f5e0ec9df96042da467a21d90990
2017-02-03 01:24:20 +00:00
Jeff Sharkey
6cfa84791d DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596 am: 6f47221263
am: 47bfa0ab25

Change-Id: I68ffb4a6973c8af213030ea441fbe2b93353fa9f
2017-02-03 01:23:23 +00:00
Jeff Sharkey
ce15555148 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29
am: 770eff87cd

Change-Id: I8aa0ade785b829b34490c3dbe80397fe7fb6bd3c
2017-02-03 01:22:20 +00:00
Jeff Sharkey
8c23d1aadb DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27
am: 8d9953964a

Change-Id: I85e2fcd6e4ab5d5183318db129ae17d5d2376005
2017-02-03 01:19:19 +00:00
Jeff Sharkey
5a50d2b12c Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b
am: cecf30c3a2

Change-Id: I3737e39d6433792abcd4f78bbf19dc19596f582e
2017-02-03 01:15:15 +00:00
Jeff Sharkey
47bfa0ab25 DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596
am: 6f47221263

Change-Id: I8736bfebc8038f24628387444bc656c103fcdf36
2017-02-03 01:14:17 +00:00
Jeff Sharkey
770eff87cd Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b
am: 7cd3c47c29

Change-Id: I91895a68c262cce27738b106c6f5d1b75a311b73
2017-02-03 01:13:24 +00:00
Jeff Sharkey
8d9953964a DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e
am: d2a9d6fa27

Change-Id: I206033dd081f2c7a04364815d8760261b87b435c
2017-02-03 01:12:38 +00:00
Jeff Sharkey
cecf30c3a2 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours
am: 43f79eec8b

Change-Id: I46242f1ea9d7a2e63267c1d3d77c6ab3c5957435
2017-02-03 01:07:09 +00:00
Jeff Sharkey
6f47221263 DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours
am: 65b0a6f596

Change-Id: Icf99c3f53e7281792db74ba5902ebf168bf07944
2017-02-03 01:06:20 +00:00
Jeff Sharkey
7cd3c47c29 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours
am: bafa3c1d3b

Change-Id: Ifacdf34a063571d521dc635003ddabb3228460d4
2017-02-03 01:05:28 +00:00
Jeff Sharkey
d2a9d6fa27 DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours
am: cdb996355e

Change-Id: I5129414295d369564a603da928f19ee6b74d2d9f
2017-02-03 01:04:24 +00:00