Geoff Mendal
a7138285f6
Import translations. DO NOT MERGE
...
Change-Id: Ia33bc5085118d42bdf2db82a6ed596eb0faaf729
Auto-generated-cl: translation import
2015-03-27 15:33:42 -07:00
Geoff Mendal
b49642dba4
Import translations. DO NOT MERGE
...
Change-Id: I581da09d2cb75aa94cef96397581ad6d43e9e007
Auto-generated-cl: translation import
2015-03-25 06:43:13 -07:00
Geoff Mendal
62fc8b4cb9
Import translations. DO NOT MERGE
...
Change-Id: Idff469dd7e5c4056acd66cd2a474571c6b89d437
Auto-generated-cl: translation import
2015-03-23 05:33:44 -07:00
Geoff Mendal
8b66082507
Import translations. DO NOT MERGE
...
Change-Id: I803b251084cc3dcaea8f55b407130c1cd3afe35c
Auto-generated-cl: translation import
2015-03-21 02:25:10 -07:00
Geoff Mendal
c71d37be31
Import translations. DO NOT MERGE
...
Change-Id: I63c7f3e9b282aefbafcf318ee3fa3fc0a11f35e8
Auto-generated-cl: translation import
2015-03-18 06:19:18 -07:00
Geoff Mendal
7deef7545b
Import translations. DO NOT MERGE
...
Change-Id: I54b54869d9723d74a99c5d71c3e5bdebc450d12f
Auto-generated-cl: translation import
2015-03-16 06:22:57 -07:00
Geoff Mendal
8346a3b3b7
Import translations. DO NOT MERGE
...
Change-Id: I16087201b8d54a088050fc36962633e73ddfd8dd
Auto-generated-cl: translation import
2015-03-09 05:44:01 -07:00
Geoff Mendal
7f54d3df52
am 404e707c
: (-s ours) am 7f4a1da1
: (-s ours) Import translations. DO NOT MERGE
...
* commit '404e707cda0dd9bece38a3315e0d13e2e09bd152':
Import translations. DO NOT MERGE
2015-02-26 23:01:24 +00:00
Geoff Mendal
404e707cda
am 7f4a1da1
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7f4a1da18ef7ffc745e2f8f174fd238397613d7c':
Import translations. DO NOT MERGE
2015-02-26 22:56:05 +00:00
Geoff Mendal
7f4a1da18e
Import translations. DO NOT MERGE
...
Change-Id: I0ac18cbbc10d46f0264dc6daa7ac8822f540b6bc
Auto-generated-cl: translation import
2015-02-26 12:07:51 -08:00
Geoff Mendal
ef8af92bf2
Import translations. DO NOT MERGE
...
Change-Id: Ibaa809885945fb1721f82668bb1a15597461d8da
Auto-generated-cl: translation import
2015-02-25 06:40:26 -08:00
Geoff Mendal
5db9f0b51c
Import translations. DO NOT MERGE
...
Change-Id: I530da8fe2577e8fda58705f3331aa10d68e3a9dc
Auto-generated-cl: translation import
2015-02-23 07:07:57 -08:00
Geoff Mendal
012fc88664
am 7262945e
: (-s ours) am 0816a36d
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7262945e4f9775f74621d0a042a080a5607553fa':
Import translations. DO NOT MERGE
2015-02-12 21:30:57 +00:00
Geoff Mendal
7262945e4f
am 0816a36d
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0816a36dc033a83663958df6e7fa2909e1ea33ac':
Import translations. DO NOT MERGE
2015-02-12 20:25:13 +00:00
Geoff Mendal
0816a36dc0
Import translations. DO NOT MERGE
...
Change-Id: I2b851ea0f18a924293a4ee962f7fae3f1a785909
Auto-generated-cl: translation import
2015-02-12 11:41:21 -08:00
Narayan Kamath
f8f1eacd21
Add an explicit dependency on org.apache.http.legacy.
...
bug: 18027885
Change-Id: I82f8348f69a9f0d1203ad0188ce8fca6d7c379bc
2015-02-06 13:40:01 +00:00
Baligh Uddin
b13a9a1978
Import translations. DO NOT MERGE
...
Change-Id: I7a9c54d4107cdaf9cc92b0a3518c6331926172f9
Auto-generated-cl: translation import
2014-12-29 07:59:55 -08:00
Yohann Roussel
053b85d0e4
Merge "-keepclasses is not a proguard option"
2014-12-23 09:40:10 +00:00
Yohann Roussel
c407643689
-keepclasses is not a proguard option
...
It looks like proguard is accepting it and make completion to a valid
option even if there's ambiguity beetwen -keepclasseswithmembers and
-keepclasseswithmembernames. Jack is not permitting that kind of
incomplete options, so fixing.
Change-Id: I034e1cb6ecdcd96beec11ac6b30a0baeb1aebba3
2014-12-22 17:11:04 +01:00
Baligh Uddin
a768f850dd
Import translations. DO NOT MERGE
...
Change-Id: I2ba07432bfd76eec5a1c5d2c1bb899a0924e5170
Auto-generated-cl: translation import
2014-12-22 07:12:16 -08:00
Geoff Mendal
d46b7331bd
Import translations. DO NOT MERGE
...
Change-Id: I3dba7ef7494fdeb170b47e47b3dbe698d32c6d91
Auto-generated-cl: translation import
2014-12-10 06:32:19 -08:00
Geoff Mendal
ee6e8a6fb1
Import translations. DO NOT MERGE
...
Change-Id: Ida4a26ba1f8b9276d171c81cb7b964675403943f
Auto-generated-cl: translation import
2014-12-08 09:42:45 -08:00
Geoff Mendal
6be8f548ab
Import translations. DO NOT MERGE
...
Change-Id: I2c2a794c08260bcf778fae556e040f6f23800d87
Auto-generated-cl: translation import
2014-12-01 07:31:27 -08:00
Geoff Mendal
17e2c05f7a
Import translations. DO NOT MERGE
...
Change-Id: I73b3f97c49183406d83b1c8262613bfe15b8baa2
Auto-generated-cl: translation import
2014-11-24 07:37:25 -08:00
Geoff Mendal
60dcc7cdfe
Import translations. DO NOT MERGE
...
Change-Id: I900191f98f910ae49d89eadf748f3986ce7e2362
Auto-generated-cl: translation import
2014-11-19 05:59:30 -08:00
Geoff Mendal
7e7e4e20d0
Import translations. DO NOT MERGE
...
Change-Id: I5f570dc10d4d12cb73abb9e9e04daf3e9addafd6
Auto-generated-cl: translation import
2014-11-10 06:06:16 -08:00
Baligh Uddin
5eead94a2a
Import translations. DO NOT MERGE
...
Change-Id: I33b5f50821665dd4574408378271cc9c20bf47f0
Auto-generated-cl: translation import
2014-11-07 02:21:23 -08:00
Geoff Mendal
c9407fc5a9
am b8e32c96
: (-s ours) am 813e1bfe
: (-s ours) am 13ff526b
: (-s ours) Import translations. DO NOT MERGE automerge: eccc844
-s ours
...
* commit 'b8e32c967ec4dd0b194715c9d029a37f391a837f':
Import translations. DO NOT MERGE
2014-11-04 01:17:31 +00:00
Geoff Mendal
b8e32c967e
am 813e1bfe
: (-s ours) am 13ff526b
: (-s ours) Import translations. DO NOT MERGE
...
automerge: eccc844
-s ours
* commit 'eccc8442bf41b6741ce80ca7ea8898a32252815f':
Import translations. DO NOT MERGE
2014-11-03 23:54:36 +00:00
Geoff Mendal
6462184e28
am c4127f91
: (-s ours) am 46fadb5f
: (-s ours) Import translations. DO NOT MERGE
...
automerge: 8eada9d
-s ours
* commit '8eada9d964cf20993615a48ec50ff364050bb2e9':
Import translations. DO NOT MERGE
2014-11-03 23:16:29 +00:00
Geoff Mendal
8e5ccfb48d
am 393c1360
: (-s ours) Import translations. DO NOT MERGE
...
automerge: 8a463d5
-s ours
* commit '8a463d55b81008ddc8fb1c3fd0c83ad5678f6c51':
Import translations. DO NOT MERGE
2014-11-03 23:10:03 +00:00
Geoff Mendal
8eada9d964
am c4127f91
: (-s ours) am 46fadb5f
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c4127f91eb9c1f46e2c1b3d1f6184926817ed866':
Import translations. DO NOT MERGE
2014-11-03 22:35:49 +00:00
Geoff Mendal
8a463d55b8
am 393c1360
: (-s ours) Import translations. DO NOT MERGE
...
* commit '393c1360fd23de57645440a30920daea757c38c0':
Import translations. DO NOT MERGE
2014-11-03 22:34:50 +00:00
Geoff Mendal
eccc8442bf
am 813e1bfe
: (-s ours) am 13ff526b
: (-s ours) Import translations. DO NOT MERGE
...
* commit '813e1bfec1fc03a9d87b4cc0fa2d6931f3485eec':
Import translations. DO NOT MERGE
2014-11-03 21:19:02 +00:00
Geoff Mendal
c4127f91eb
am 46fadb5f
: (-s ours) Import translations. DO NOT MERGE
...
* commit '46fadb5f585a2ee447bc6997216d3db70571217c':
Import translations. DO NOT MERGE
2014-11-03 21:13:36 +00:00
Geoff Mendal
813e1bfec1
am 13ff526b
: (-s ours) Import translations. DO NOT MERGE
...
* commit '13ff526ba803087944fc857ca2dfb3982ff25a65':
Import translations. DO NOT MERGE
2014-11-03 21:11:42 +00:00
Geoff Mendal
1e86f7978a
Import translations. DO NOT MERGE
...
Change-Id: I4793d0f9baccd8d3dc96713562d3cc2ddd983283
Auto-generated-cl: translation import
2014-11-03 12:56:07 -08:00
Geoff Mendal
13ff526ba8
Import translations. DO NOT MERGE
...
Change-Id: I8153cef016b0ea76fa417fab11ea1e0935809be6
Auto-generated-cl: translation import
2014-11-03 12:52:32 -08:00
Geoff Mendal
393c1360fd
Import translations. DO NOT MERGE
...
Change-Id: Ibe9ea47c290b5897a1515e6a834d287007dc5b43
Auto-generated-cl: translation import
2014-11-03 12:51:32 -08:00
Geoff Mendal
46fadb5f58
Import translations. DO NOT MERGE
...
Change-Id: I0be4d98b7f5583b1d2d5f61c2f6c39d768fcba05
Auto-generated-cl: translation import
2014-11-03 12:50:43 -08:00
Paul Westbrook
5a22261ac3
am f27710dd
: am aeaa7616
: am 19c35f5f
: am 1c0662f9
: fix bad merge
...
* commit 'f27710dd69d93ca89fcdd58c6de876ef0c59b81d':
fix bad merge
2014-11-02 21:10:38 +00:00
Paul Westbrook
cd36d76601
resolved conflicts for merge of 724c98b0
to master
...
Change-Id: I00f16b76771f10e7008b95c0170d12edf949c96a
2014-11-02 13:08:52 -08:00
Paul Westbrook
f27710dd69
am aeaa7616
: am 19c35f5f
: am 1c0662f9
: fix bad merge
...
* commit 'aeaa76164ac1ded4e932ca27426bacad5ce0edf3':
fix bad merge
2014-11-02 20:55:01 +00:00
Paul Westbrook
aeaa76164a
am 19c35f5f
: am 1c0662f9
: fix bad merge
...
* commit '19c35f5f574a1ccf1447c17d55cb1828d09ab140':
fix bad merge
2014-11-02 20:51:14 +00:00
Paul Westbrook
19c35f5f57
am 1c0662f9
: fix bad merge
...
* commit '1c0662f998ab83976e5eba544d366876e28e8968':
fix bad merge
2014-11-02 20:47:24 +00:00
Paul Westbrook
1c0662f998
fix bad merge
...
Change-Id: I3cb09668bbb629237edbe683b11bbad13aabfe92
2014-11-02 12:43:08 -08:00
Paul Westbrook
724c98b021
fix bad merge
...
Change-Id: I6d26de849761bfa31e521e7836ec6358907bbbf9
2014-11-02 12:34:33 -08:00
Paul Westbrook
13b91b644a
resolved conflicts for merge of 9a920fd9
to master
...
Change-Id: Ib2bcfb818f8a645436d7b2997137b3e15167a3de
2014-11-02 12:04:22 -08:00
Paul Westbrook
9a920fd979
resolved conflicts for merge of 7dd59de7
to lmp-mr1-dev-plus-aosp
...
Change-Id: I877043f64b96b9073652f7cec90bff08dd6e69f5
2014-11-02 11:10:17 -08:00
Geoff Mendal
195ddaf883
am ded6357d
: (-s ours) am 4301e602
: (-s ours) am 268485ff
: (-s ours) am b188964b
: (-s ours) am 96ade4e2
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ded6357d8a248e4f57777352c9b58ef9000d56a1':
Import translations. DO NOT MERGE
2014-11-02 19:03:29 +00:00