OSDN Git Service
Bill Yi [Sat, 27 Jan 2018 17:18:18 +0000 (17:18 +0000)]
Import translations. DO NOT MERGE
am:
7234404ed3 -s ours
Change-Id: I3bbffffdcf0bf8757d2e329bd70395d8d512a356
Bill Yi [Sat, 27 Jan 2018 13:28:23 +0000 (05:28 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iaeaa7571a045b4356c454708d360ee520e253bc1
Xin Li [Thu, 7 Dec 2017 12:56:41 +0000 (12:56 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
0658146997 -s ours
am:
6e2c1bdca4
Change-Id: If4d6ac81a29e6adbc09ecd96fd3b565603251032
Xin Li [Thu, 7 Dec 2017 12:52:00 +0000 (12:52 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am:
0658146997 -s ours
Change-Id: I5aff9abe8f04dbd5217255de33ae7eebbb5b03bc
Xin Li [Thu, 7 Dec 2017 06:52:11 +0000 (06:52 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am:
53e928cde7 -s ours
am:
bc5992d659
Change-Id: If0ab1e9b8eec4a303ffa3608741519403da0e3e5
Xin Li [Thu, 7 Dec 2017 04:23:56 +0000 (04:23 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am:
53e928cde7 -s ours
Change-Id: Idfac165fa00fc76408d4b0c98fc3e398bb0fc91d
Xin Li [Wed, 6 Dec 2017 23:18:29 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 19:52:05 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I2c87f970e53f32486e748642691c6d7231e46548
Bill Yi [Thu, 30 Nov 2017 01:45:41 +0000 (01:45 +0000)]
Import translations. DO NOT MERGE
am:
7ebc83533a -s ours
Change-Id: I95a1766e8612597b5d37535747cc61e4f23e8fc0
Bill Yi [Thu, 30 Nov 2017 00:02:29 +0000 (16:02 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: I8f2b26860d2d68700c357e66e566d929ebee09f4
Xin Li [Wed, 15 Nov 2017 00:38:21 +0000 (16:38 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: Ib06ebe440487ee913d5670c55300b75f5f2c8323
Xin Li [Mon, 13 Nov 2017 22:35:41 +0000 (14:35 -0800)]
Merge commit '
e088d4b48e74646a148b6839fb5cf0e78dcd40d4' into HEAD
Change-Id: I2d5709acb94525894558f9c8ca8230197dd8eaf3
Bill Yi [Mon, 30 Oct 2017 07:33:12 +0000 (07:33 +0000)]
Import translations. DO NOT MERGE
am:
22125898d7 -s ours
Change-Id: Ibd8092b0fc3d1854f4961df4a9e1519c7f362772
Bill Yi [Sun, 29 Oct 2017 07:37:38 +0000 (00:37 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I4b2ef70e99e3c0333b7f097292e280eff6ea4f77
Bill Yi [Fri, 20 Oct 2017 17:11:13 +0000 (17:11 +0000)]
Import translations. DO NOT MERGE am:
867c2a333b -s ours
am:
3ef7cf5ae8 -s ours
Change-Id: I77523bdc53a64115146d2fd099a58c389ef2e716
Bill Yi [Fri, 20 Oct 2017 16:36:22 +0000 (16:36 +0000)]
Import translations. DO NOT MERGE
am:
867c2a333b -s ours
Change-Id: I42c139c47c292dea7374d4d6c6a19ed3bf85cbe4
Bill Yi [Fri, 20 Oct 2017 08:11:14 +0000 (01:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: Idece2fc08294600d7f7c444506aab87ad435e224
Bill Yi [Tue, 17 Oct 2017 05:36:20 +0000 (05:36 +0000)]
Import translations. DO NOT MERGE am:
3beb113d7c -s ours
am:
ebe8700d44 -s ours
Change-Id: Ie64213aa47c4e9fa5fe7228a5c4e6ac29cac92fe
Bill Yi [Tue, 17 Oct 2017 00:20:34 +0000 (00:20 +0000)]
Import translations. DO NOT MERGE am:
3beb113d7c -s ours
am:
d8d7ab2100 -s ours
Change-Id: Ib4707a5610266cafaeffc7d7b3d30706ca633e24
Bill Yi [Tue, 17 Oct 2017 00:20:27 +0000 (00:20 +0000)]
Import translations. DO NOT MERGE
am:
3beb113d7c -s ours
Change-Id: Ic4d3046ab27b074be059cc23d372dfd875974533
Bill Yi [Tue, 17 Oct 2017 00:20:12 +0000 (00:20 +0000)]
Import translations. DO NOT MERGE
am:
9129a76e01 -s ours
Change-Id: I97c0e78402baa246805bb78a985def6453da8807
Bill Yi [Tue, 17 Oct 2017 00:15:23 +0000 (00:15 +0000)]
Import translations. DO NOT MERGE
am:
3beb113d7c -s ours
Change-Id: Id3bfdb57096b9d71c0ab03873ba632dbe8a4b510
Bill Yi [Mon, 16 Oct 2017 06:57:43 +0000 (23:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I06bbcabf9346183edf8307d9b77f98e643f5d717
Bill Yi [Mon, 16 Oct 2017 06:56:41 +0000 (23:56 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ie9c80f28b107688784cc211373f5453b6d329144
Bill Yi [Sat, 16 Sep 2017 21:22:55 +0000 (21:22 +0000)]
Import translations. DO NOT MERGE
am:
29d8f0dbdc -s ours
Change-Id: I0cc62d6c42c5b0d200490cb59d8b574248c833e2
Bill Yi [Sat, 16 Sep 2017 15:19:26 +0000 (08:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I366eda67212898909736cadaed3ccccda365c0b2
Bill Yi [Wed, 30 Aug 2017 00:42:45 +0000 (00:42 +0000)]
Import translations. DO NOT MERGE
am:
9f3ef2ac81 -s ours
Change-Id: Ie204c828edcc17177c466002f63be0e73cfb89b3
Bill Yi [Tue, 29 Aug 2017 20:19:52 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ib380a6c5d7d87dadd9c807bd0cbee8404abfc999
Hyunyoung Song [Tue, 15 Aug 2017 22:59:18 +0000 (22:59 +0000)]
Adaptive icon for Camera2 AOSP Bug:
64332797 Test: manual
am:
dbed2a484c
Change-Id: Ia053d5426aa7835e03ed6343523467b66d4c19f6
Elliott Hughes [Tue, 15 Aug 2017 21:00:53 +0000 (21:00 +0000)]
Merge "C++14 is the default now." am:
572bd35933 am:
a4cb3c1c2d am:
54ea634edd
am:
25a3d3833c
Change-Id: Iab6b96e5c15d87876f0c5a9f9c9e109b38d3b611
Elliott Hughes [Tue, 15 Aug 2017 20:50:13 +0000 (20:50 +0000)]
Merge "C++14 is the default now." am:
572bd35933 am:
a4cb3c1c2d
am:
54ea634edd
Change-Id: I620848d2cc08f2b73c0d1e274011fe59a475b9c5
Elliott Hughes [Tue, 15 Aug 2017 20:45:25 +0000 (20:45 +0000)]
Merge "C++14 is the default now." am:
572bd35933
am:
a4cb3c1c2d
Change-Id: I7d01629d1f7db0c2daaf668667f21bcfe14a75a3
Elliott Hughes [Tue, 15 Aug 2017 20:38:44 +0000 (20:38 +0000)]
Merge "C++14 is the default now."
am:
572bd35933
Change-Id: I60e7ceae8c7190b5fec557ae132a5098ed10cc90
Elliott Hughes [Tue, 15 Aug 2017 20:32:30 +0000 (20:32 +0000)]
Merge "C++14 is the default now."
Hyunyoung Song [Tue, 15 Aug 2017 18:08:44 +0000 (11:08 -0700)]
Adaptive icon for Camera2 AOSP
Bug:
64332797
Test: manual
Change-Id: I91ddd5db21f4164ef52d2de94230c0298cc7394c
Elliott Hughes [Sat, 12 Aug 2017 06:04:46 +0000 (23:04 -0700)]
C++14 is the default now.
Bug: http://b/
32019064
Test: builds
Change-Id: Ibe0b5d4474c36492656f49c0873150567d213e27
Bill Yi [Mon, 7 Aug 2017 06:12:00 +0000 (06:12 +0000)]
Import translations. DO NOT MERGE am:
d8bfd41abe -s ours am:
079e27ad8b -s ours
am:
dc0fd6c578 -s ours
Change-Id: Ia04b9a123cc1d68fab0eab544961e3c029d6cf5a
Bill Yi [Mon, 7 Aug 2017 05:52:22 +0000 (05:52 +0000)]
Import translations. DO NOT MERGE am:
d8bfd41abe -s ours
am:
079e27ad8b -s ours
Change-Id: I8b955190145b659697724db4dd1af956c6701462
Bill Yi [Mon, 7 Aug 2017 05:37:38 +0000 (05:37 +0000)]
Import translations. DO NOT MERGE
am:
d8bfd41abe -s ours
Change-Id: Id6ff7ded58874204fd7f525ebb3a9f693978c01c
Bill Yi [Sun, 6 Aug 2017 17:58:16 +0000 (10:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4cf45ba79302aac18870517c6825a23a045779c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 03:11:12 +0000 (03:11 +0000)]
Import translations. DO NOT MERGE am:
ea11729ec0 -s ours
am:
13867e4122 -s ours
Change-Id: Ia876f7c9498f719f32121be8dbe193e33435c4eb
Bill Yi [Sat, 5 Aug 2017 03:05:23 +0000 (03:05 +0000)]
Import translations. DO NOT MERGE am:
ea11729ec0 -s ours
am:
072ca47b99 -s ours
Change-Id: I82a74a4a79ff9295b667f64ca3986d83b7903ff2
Bill Yi [Sat, 5 Aug 2017 02:59:12 +0000 (02:59 +0000)]
Import translations. DO NOT MERGE
am:
ea11729ec0 -s ours
Change-Id: I91f2ca65ed95eed98449db059b4e127e1547be80
Bill Yi [Sat, 5 Aug 2017 02:57:52 +0000 (02:57 +0000)]
Import translations. DO NOT MERGE
am:
ea11729ec0 -s ours
Change-Id: I64537df06c42588147d0fea90f27a0076b0ddb15
Bill Yi [Fri, 4 Aug 2017 22:54:35 +0000 (15:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I84192201c0c61e7890fdbf6f6e09c018559c051d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Android Build Merger (Role) [Wed, 2 Aug 2017 05:17:33 +0000 (05:17 +0000)]
Merge "Merge "Camera: allow instant app do IMAGE_CAPTURE am:
0e804c2280 am:
73774aed7c" into oc-dr1-dev-plus-aosp am:
e3899fe278" into oc-mr1-dev-plus-aosp
Yin-Chia Yeh [Wed, 2 Aug 2017 05:17:25 +0000 (05:17 +0000)]
Merge "Camera: allow instant app do IMAGE_CAPTURE am:
0e804c2280 am:
73774aed7c" into oc-dr1-dev-plus-aosp
am:
e3899fe278
Change-Id: I2ba276ac27591404265f5d8267a1ab0b3cdcca7e
Android Build Merger (Role) [Wed, 2 Aug 2017 05:17:22 +0000 (05:17 +0000)]
Merge "Camera: allow instant app do IMAGE_CAPTURE am:
0e804c2280 am:
73774aed7c am:
c66d44b076" into oc-mr1-dev-plus-aosp
Yin-Chia Yeh [Wed, 2 Aug 2017 05:17:15 +0000 (05:17 +0000)]
Camera: allow instant app do IMAGE_CAPTURE am:
0e804c2280 am:
73774aed7c
am:
c66d44b076
Change-Id: Ic8b015bb808df7dfdcb21a9874db1933758f1813
Yin-Chia Yeh [Wed, 2 Aug 2017 05:17:14 +0000 (05:17 +0000)]
Camera: allow instant app do IMAGE_CAPTURE am:
0e804c2280 am:
94a30bf46d
am:
58373e3d4e
Change-Id: If92061dbcd4760f49338fba68099d35b16eab2ee
Android Build Merger (Role) [Wed, 2 Aug 2017 05:12:51 +0000 (05:12 +0000)]
Merge "Camera: allow instant app do IMAGE_CAPTURE am:
0e804c2280 am:
73774aed7c" into oc-dr1-dev-plus-aosp
Yin-Chia Yeh [Wed, 2 Aug 2017 05:12:44 +0000 (05:12 +0000)]
Camera: allow instant app do IMAGE_CAPTURE am:
0e804c2280
am:
73774aed7c
Change-Id: I6fb66d6ccdc84ad42a2eac678e762cad470f3849
Yin-Chia Yeh [Wed, 2 Aug 2017 05:12:44 +0000 (05:12 +0000)]
Camera: allow instant app do IMAGE_CAPTURE am:
0e804c2280
am:
94a30bf46d
Change-Id: Icbaa55e2dbf56b9307ef1cb97b13043b872b2fa7
Yin-Chia Yeh [Wed, 2 Aug 2017 05:12:44 +0000 (05:12 +0000)]
Camera: allow instant app do IMAGE_CAPTURE am:
0e804c2280
am:
73774aed7c
Change-Id: I3bd99c9eb1e2015d07ece0e82aa4ad467bf2c7a2
Yin-Chia Yeh [Wed, 2 Aug 2017 05:08:14 +0000 (05:08 +0000)]
Camera: allow instant app do IMAGE_CAPTURE
am:
0e804c2280
Change-Id: Ib0522454df8cc0e93a02e589f963267538833451
Yin-Chia Yeh [Wed, 2 Aug 2017 05:08:13 +0000 (05:08 +0000)]
Camera: allow instant app do IMAGE_CAPTURE
am:
0e804c2280
Change-Id: I5fa416cb26de79bb7a31597e60a6fd1e76a020b1
Yin-Chia Yeh [Mon, 31 Jul 2017 21:10:58 +0000 (14:10 -0700)]
Camera: allow instant app do IMAGE_CAPTURE
Test: build
Bug:
64137808
Change-Id: I744135c0e13e50378b6f245b4f6ca2aca36936bd
Eiichi,Ohnishi [Tue, 25 Jul 2017 20:38:06 +0000 (20:38 +0000)]
Merge "Use support level ZSL and Flash only when platform supports" am:
8690a7317d am:
92ab0d63c2 am:
0529fdaedf
am:
b42861b84b
Change-Id: I77770b75d41bfb0e3ce96f9f635a47d9141e2be7
Eiichi,Ohnishi [Tue, 25 Jul 2017 20:34:41 +0000 (20:34 +0000)]
Merge "Use support level ZSL and Flash only when platform supports" am:
8690a7317d am:
92ab0d63c2
am:
0529fdaedf
Change-Id: Id18345701037b6306f2fec8dc233cd2fb1760833
Eiichi,Ohnishi [Tue, 25 Jul 2017 20:31:20 +0000 (20:31 +0000)]
Merge "Use support level ZSL and Flash only when platform supports" am:
8690a7317d
am:
92ab0d63c2
Change-Id: I919ea3df2f1f6eb99aba67fdd985e0d37a441708
Eiichi,Ohnishi [Tue, 25 Jul 2017 20:27:20 +0000 (20:27 +0000)]
Merge "Use support level ZSL and Flash only when platform supports"
am:
8690a7317d
Change-Id: Ie6db06ce5747bab1f995a05a7aa624b0547e725a
Treehugger Robot [Tue, 25 Jul 2017 20:15:59 +0000 (20:15 +0000)]
Merge "Use support level ZSL and Flash only when platform supports"
Eiichi,Ohnishi [Wed, 12 Jul 2017 08:33:31 +0000 (17:33 +0900)]
Use support level ZSL and Flash only when platform supports
Camera2 does not work when platform has no capability for ZSL and Flash.
To avoid this:
- Select support level LIMITED_YUV when reprocessing is not supported.
And use TEMPLATE_STILL_CAPTURE instead of
TEMPLATE_ZERO_SHUTTER_LAG to take picture in LIMITED_YUV.
- Select Flash off when Flash is not supported.
Bug:
63694123
Change-Id: I147c275f9126be0e1050c6cc61896adebce5c578
Bill Yi [Thu, 13 Jul 2017 12:43:06 +0000 (05:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1757c3b535bed5178497bccd704e1442c20d0f93
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Fri, 7 Jul 2017 10:28:46 +0000 (03:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4d7f713f7e712a322123140c26626f936c710516
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Wed, 21 Jun 2017 19:41:41 +0000 (19:41 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Wed, 21 Jun 2017 17:59:49 +0000 (17:59 +0000)]
Merge "Only onboard when launched through front door. am:
2d6d4d23a9 am:
c34270d03d" into oc-dr1-dev-plus-aosp
am:
2e781bb778
Change-Id: Ifd6e99383dbd5a528e9f402a8d3abf1d8d054636
Jeff Sharkey [Wed, 21 Jun 2017 17:56:38 +0000 (17:56 +0000)]
Only onboard when launched through front door. am:
2d6d4d23a9 am:
b91d23b0ae
am:
9605596b54
Change-Id: I91683bbbd31be80e7e6e74d9803488f2664ccfe1
Android Build Merger (Role) [Wed, 21 Jun 2017 17:46:12 +0000 (17:46 +0000)]
Merge "Only onboard when launched through front door. am:
2d6d4d23a9 am:
c34270d03d" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Wed, 21 Jun 2017 17:45:31 +0000 (17:45 +0000)]
Only onboard when launched through front door. am:
2d6d4d23a9
am:
c34270d03d
Change-Id: I2572057489e7ffa53dfb6a8a7e8808a4f4be0a32
Jeff Sharkey [Wed, 21 Jun 2017 17:44:20 +0000 (17:44 +0000)]
Only onboard when launched through front door. am:
2d6d4d23a9
am:
b91d23b0ae
Change-Id: If77b0960c7e7c2ccc8576d33cad14141a497e806
Jeff Sharkey [Wed, 21 Jun 2017 17:38:03 +0000 (17:38 +0000)]
Only onboard when launched through front door.
am:
2d6d4d23a9
Change-Id: I3ca9470af9a3814980c059e7785466f2330011e5
Jeff Sharkey [Wed, 21 Jun 2017 17:38:03 +0000 (17:38 +0000)]
Only onboard when launched through front door.
am:
2d6d4d23a9
Change-Id: I05d5de2cba94599f0f55d817114cf2e965d5fec1
Bill Yi [Wed, 21 Jun 2017 05:39:59 +0000 (22:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia409972d8e5e8a4cce8ee831cfa9e33c58fc36d1
Auto-generated-cl: translation import
Jeff Sharkey [Tue, 20 Jun 2017 22:39:16 +0000 (16:39 -0600)]
Only onboard when launched through front door.
When an app is using public API to take a photo, don't confuse the
user with the onboarding flow.
Test: cts-tradefed run commandAndExit cts-dev -m CtsProviderTestCases -t android.provider.cts.MediaStoreUiTest#testImageCapture
Bug:
62204676
Change-Id: Ie0de7b879302a5dd4bf941bf31b449bda95cfdf7
Bill Yi [Wed, 31 May 2017 15:16:55 +0000 (08:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5f3dc21659703b6336b6e32dba3891b4dffad5a9
Auto-generated-cl: translation import
Bill Yi [Tue, 16 May 2017 11:07:23 +0000 (04:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaf42edb51b0ffeabfe5766982509dd1ee71e5a7c
Auto-generated-cl: translation import
Bill Yi [Thu, 11 May 2017 11:42:38 +0000 (11:42 +0000)]
Import translations. DO NOT MERGE am:
2b06298040 -s ours
am:
066f8494ee -s ours
Change-Id: I3d05d07cf9a503d1af03d812e8db25a66ab462f9
Bill Yi [Thu, 11 May 2017 05:41:25 +0000 (05:41 +0000)]
Import translations. DO NOT MERGE
am:
2b06298040 -s ours
Change-Id: Iaf546e0c8e5d3ebb9d7d5671871b6c583e9fcf03
Bill Yi [Wed, 10 May 2017 19:40:25 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iafd232fbeec8aaaf835a4467762690c4582cee72
Auto-generated-cl: translation import
Bill Yi [Tue, 9 May 2017 12:13:08 +0000 (05:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icc1845051fff699b69e67a2f530693f426a6c7ba
Auto-generated-cl: translation import
Alan Viverette [Tue, 2 May 2017 17:54:20 +0000 (17:54 +0000)]
Merge "Revert "Include v4, use AAPT2"" into oc-dev am:
487830bbcf
am:
69c572d803
Change-Id: Ic99f16c26b8317748d47336729a57c5e9fdb474a
Alan Viverette [Tue, 2 May 2017 17:43:00 +0000 (17:43 +0000)]
Merge "Revert "Include v4, use AAPT2"" into oc-dev
am:
487830bbcf
Change-Id: I731252c2b1de50d7d22327b2b4b963b9825dfa87
TreeHugger Robot [Tue, 2 May 2017 17:17:14 +0000 (17:17 +0000)]
Merge "Revert "Include v4, use AAPT2"" into oc-dev
Alan Viverette [Tue, 2 May 2017 15:52:38 +0000 (15:52 +0000)]
Merge "Include v4, use AAPT2" into oc-dev am:
a09a333fd2
am:
e164d75371
Change-Id: I4910cd7c5babe0ea85541f15c934ac0c5cf231f1
Alan Viverette [Tue, 2 May 2017 15:11:20 +0000 (15:11 +0000)]
Revert "Include v4, use AAPT2"
Unbundled build was mysteriously failing on missing v13 res APK.
This reverts commit
1c43fe84ebb78d2dc72879be405042ff27d2e2df.
Change-Id: I17d95538dcda742baaf4f356ccdea09a7db016a6
Alan Viverette [Tue, 2 May 2017 13:15:17 +0000 (13:15 +0000)]
Merge "Include v4, use AAPT2" into oc-dev
am:
a09a333fd2
Change-Id: I5e96976c24d6ec51db9f6952d4b4ba6a9f8724c7
TreeHugger Robot [Tue, 2 May 2017 13:11:23 +0000 (13:11 +0000)]
Merge "Include v4, use AAPT2" into oc-dev
The Android Open Source Project [Tue, 2 May 2017 10:09:13 +0000 (03:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I70e1be10623e7f6c19c0c7ee7b9b3f18505ab3e4
Auto-generated-cl: translation import
TreeHugger Robot [Sun, 30 Apr 2017 16:14:11 +0000 (16:14 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 29 Apr 2017 18:01:50 +0000 (18:01 +0000)]
Import translations. DO NOT MERGE am:
be4075137d -s ours
am:
14ed9bec56 -s ours
Change-Id: I35c01105a5beaa989c605fc1419bdf8ead306abd
Bill Yi [Sat, 29 Apr 2017 17:54:20 +0000 (17:54 +0000)]
Import translations. DO NOT MERGE
am:
be4075137d -s ours
Change-Id: I027c9405c5d4baf9bcc535fc26f719085291c95c
Bill Yi [Sat, 29 Apr 2017 08:50:45 +0000 (01:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a0c67d9a4ced9618a3e594f267cd1edc6143150
Auto-generated-cl: translation import
Bill Yi [Sat, 29 Apr 2017 08:47:55 +0000 (01:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie7defff21fd529b338daf0c13219877f6e85a3ee
Auto-generated-cl: translation import
Adam Lesinski [Thu, 27 Apr 2017 05:28:25 +0000 (05:28 +0000)]
Remove illegal @+ use with dimen type am:
e8a6289318
am:
85dacbfa30
Change-Id: If9fd204ac047cf8ee975f24fff2f71779f905efe
Adam Lesinski [Thu, 27 Apr 2017 04:55:05 +0000 (04:55 +0000)]
Remove illegal @+ use with dimen type
am:
e8a6289318
Change-Id: I348198d2e5e23ff043ebd2fee3dc4d8ab8a129b1
Adam Lesinski [Wed, 26 Apr 2017 23:49:36 +0000 (16:49 -0700)]
Remove illegal @+ use with dimen type
@+id/foo is a way to specify an ID or create one if it doesn't exist.
This is fine to do because an ID is simply a placeholder value that is
assigned a resource ID.
@+dimen/foo doesn't make sense because there is no implicit value to
create if the resource doesn't exist.
Bug:
37716235
Test: builds
Change-Id: Ic897b208fd338bc00ac47de04ea74f0993e6a052
Alan Viverette [Wed, 26 Apr 2017 15:03:32 +0000 (11:03 -0400)]
Include v4, use AAPT2
Test: make checkbuild
Change-Id: I663698dbc698685139250f7fc7150894cfa9b7d0
Bill Yi [Wed, 26 Apr 2017 12:20:41 +0000 (05:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id902bebf472946204c67cae0d88eb364ef552e6e
Auto-generated-cl: translation import
Bill Yi [Fri, 21 Apr 2017 02:55:11 +0000 (19:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebd94bf65870f003bf4840bb99abbf0cf4cecbe3
Auto-generated-cl: translation import
OSDN Git Service
