Baligh Uddin
a2d3081a16
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: abd0988 -s ours
...
am: da5daab -s ours
* commit 'da5daabcae0479788d0a88f0a1e12235b72fb0a6':
Import translations. DO NOT MERGE
Change-Id: I39033afe48c2394760f7140957b05bb7a29f78e8
2016-04-27 22:46:26 +00:00
Baligh Uddin
da5daabcae
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: abd0988 -s ours
* commit 'abd098801198a696914e4d2ccaae95ed9fa3f944':
Import translations. DO NOT MERGE
Change-Id: Ib7ea003744e6691aacdb365126784e50d5eaf2a4
2016-04-27 21:42:29 +00:00
Baligh Uddin
3025166f1a
Merge "Import translations. DO NOT MERGE"
2016-04-27 21:18:07 +00:00
Baligh Uddin
abd0988011
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-04-27 21:17:58 +00:00
Bill Yi
0e652e5c02
Import translations. DO NOT MERGE am: ca5003e -s ours am: 97ee2b1 -s ours
...
am: f1d2140 -s ours
* commit 'f1d2140d1a4803257b78537ed0735dc540089669':
Change-Id: Ib205726a79bf6f8a5b37f98bac5a1f54afbabcdc
2016-04-27 00:55:08 +00:00
Bill Yi
d575e7210a
Import translations. DO NOT MERGE am: ca5003e -s ours am: e84e73a -s ours
...
am: 0bc96a7 -s ours
* commit '0bc96a736a1a8392f8a8bccd12c14bbf78b8f784':
Import translations. DO NOT MERGE
Change-Id: I6c61e5ca179a1598ee2f630c87dc5caef87f6047
2016-04-27 00:55:07 +00:00
Bill Yi
f1d2140d1a
Import translations. DO NOT MERGE am: ca5003e -s ours
...
am: 97ee2b1 -s ours
* commit '97ee2b1fbec2735bc54877f907447e0047aa07b6':
Change-Id: I22fda6dc0d92828b8331dbac473264d0f2295b0c
2016-04-26 23:26:01 +00:00
Bill Yi
0bc96a736a
Import translations. DO NOT MERGE am: ca5003e -s ours
...
am: e84e73a -s ours
* commit 'e84e73a0187027e559871ae72e33bce8986c2be8':
Import translations. DO NOT MERGE
Change-Id: Id7c1a715d5dd776cb41bdd52f8097159670a6b63
2016-04-26 23:22:42 +00:00
Bill Yi
c3b38d1374
Import translations. DO NOT MERGE am: a004356 -s ours
...
am: c9890bf -s ours
* commit 'c9890bf5b2a712f43bc7dd26410ceb09d680ff17':
Import translations. DO NOT MERGE
Change-Id: I2202b7ea61f4f67ebe557049fe64514211ce4a69
2016-04-26 23:19:04 +00:00
Bill Yi
97ee2b1fbe
Import translations. DO NOT MERGE
...
am: ca5003e -s ours
* commit 'ca5003e0336ebe4b8260172ed8183c5ae9095018':
Import translations. DO NOT MERGE
Change-Id: I0a499ffbafa52d0bc9f2a4654ea250c9fa0263ed
2016-04-26 22:52:09 +00:00
Bill Yi
e84e73a018
Import translations. DO NOT MERGE
...
am: ca5003e -s ours
* commit 'ca5003e0336ebe4b8260172ed8183c5ae9095018':
Import translations. DO NOT MERGE
Change-Id: I51c2cfd99a9c6d25cd3da1344229dba7885cc101
2016-04-26 22:48:43 +00:00
Bill Yi
c9890bf5b2
Import translations. DO NOT MERGE
...
am: a004356 -s ours
* commit 'a00435652a8f922cd09cef1ef38fa39c93c3f2c4':
Import translations. DO NOT MERGE
Change-Id: I819d91029945fb4594d9b9e84b5a43e06c2bbb71
2016-04-26 22:17:05 +00:00
Bill Yi
a00435652a
Import translations. DO NOT MERGE
...
Change-Id: Id48a7d573bdfd417975bb1054eb6a2453a151bf8
Auto-generated-cl: translation import
2016-04-26 15:06:53 -07:00
Bill Yi
ca5003e033
Import translations. DO NOT MERGE
...
Change-Id: I3383f51c68573c3e350f1bad5fce90be5643edb0
Auto-generated-cl: translation import
2016-04-26 15:04:31 -07:00
Bill Yi
e404d76e3a
Import translations. DO NOT MERGE
...
Change-Id: Ic9a498dd7367a61fc2d380dc6eeeea0c4cafc8bf
Auto-generated-cl: translation import
2016-04-26 15:01:57 -07:00
Baligh Uddin
9f5565bd10
Import translations. DO NOT MERGE
...
Change-Id: Idd1fdeee52a77d6fb4ecc271b6fdfc41e62b2bd0
Auto-generated-cl: translation import
2016-04-26 13:38:33 -07:00
Baligh Uddin
2c995942e3
Import translations. DO NOT MERGE
...
Change-Id: I2b8cd2877f4f21d64968b520258a80a3886310c5
Auto-generated-cl: translation import
2016-04-26 11:43:04 -07:00
Bill Yi
bb1634ed58
Import translations. DO NOT MERGE am: e59f5de -s ours am: 29c7a34 -s ours
...
am: fc5ac34 -s ours
* commit 'fc5ac34867eb841dad768a7f9823d65d907103e1':
Change-Id: Ib3c9bd7ee289423d4842b45c3889acfd9aa595ae
2016-04-25 13:09:25 +00:00
Bill Yi
fc5ac34867
Import translations. DO NOT MERGE am: e59f5de -s ours
...
am: 29c7a34 -s ours
* commit '29c7a347b92cc4696ac89248f03228944a57673f':
Change-Id: I428ab05040ef8033999a6cf3cf21107a073c7c69
2016-04-25 13:04:11 +00:00
Bill Yi
846dca9c5d
Import translations. DO NOT MERGE am: e59f5de -s ours am: d210dc0 -s ours
...
am: c27646f -s ours
* commit 'c27646f9f1633797be018001f6c04faab8bdb515':
Import translations. DO NOT MERGE
Change-Id: Ibeff8dbd04c90fd00671ed75a6092f86efada6fa
2016-04-25 13:03:53 +00:00
Bill Yi
c27646f9f1
Import translations. DO NOT MERGE am: e59f5de -s ours
...
am: d210dc0 -s ours
* commit 'd210dc0478131a8537dbd853e678707fd9e09587':
Import translations. DO NOT MERGE
Change-Id: If01820901a4fe03a96a5d11a5c439ac40fef5e35
2016-04-25 12:58:41 +00:00
Bill Yi
29c7a347b9
Import translations. DO NOT MERGE
...
am: e59f5de -s ours
* commit 'e59f5de5772f16a9969d655d5b184d0f75d664b9':
Import translations. DO NOT MERGE
Change-Id: Ib918ef5f3fdf97363c2d7449c0412e8b3ce87b34
2016-04-25 12:53:24 +00:00
Bill Yi
d210dc0478
Import translations. DO NOT MERGE
...
am: e59f5de -s ours
* commit 'e59f5de5772f16a9969d655d5b184d0f75d664b9':
Import translations. DO NOT MERGE
Change-Id: I06b45f12e41dff2da3d4538cbf35203008372cea
2016-04-25 12:53:24 +00:00
Bill Yi
e59f5de577
Import translations. DO NOT MERGE
...
Change-Id: I9706fca12f3c0a19019c41ba0eaf395ac53ba0b1
Auto-generated-cl: translation import
2016-04-24 22:28:28 -07:00
Bill Yi
3470fea07d
Import translations. DO NOT MERGE
...
Change-Id: Ice2fc6151b69ad3a4029184a5afa6020085219f2
Auto-generated-cl: translation import
2016-04-24 20:56:43 -07:00
Tao Bao
deea2dff25
Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 am: 2f9be55
...
am: a28617a
* commit 'a28617a2dccfeda98fc3449b94c270cedd84aa7b':
Change-Id: I06dcb597c0bdd3013c54f4bb1a6bbbb6ff0656f2
2016-04-23 00:08:10 +00:00
Tao Bao
e93c43fc66
Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 am: 5e3aa78
...
am: 4dc24a5
* commit '4dc24a5bf4b1141db6888c474ebfd225bf69060c':
recovery: Dump the signature in the zip package.
Change-Id: Ied1045a42aeeb1e6a0951189a8db2d35a68f47c3
2016-04-23 00:08:10 +00:00
Tao Bao
a28617a2dc
Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089
...
am: 2f9be55
* commit '2f9be5517225b33be30f48630ba581087672ea75':
Change-Id: I4ebadf342f35f4a06af84d2c437f21526a4949c8
2016-04-23 00:01:03 +00:00
Tao Bao
4dc24a5bf4
Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089
...
am: 5e3aa78
* commit '5e3aa78c8bb47ee96ed5d2d9713b64ae6c8823be':
recovery: Dump the signature in the zip package.
Change-Id: I44b52bfe8b2ad3e66f0f393784494a45652ee343
2016-04-22 23:56:20 +00:00
Tao Bao
2f9be55172
Merge "recovery: Dump the signature in the zip package." into nyc-dev
...
am: 34ca089
* commit '34ca0892f4ae440becbe8097e7b68cd5a6d494d3':
recovery: Dump the signature in the zip package.
Change-Id: I674e1a43aafe0140371b123bb7e14fc928c43988
2016-04-22 23:49:58 +00:00
Tao Bao
5e3aa78c8b
Merge "recovery: Dump the signature in the zip package." into nyc-dev
...
am: 34ca089
* commit '34ca0892f4ae440becbe8097e7b68cd5a6d494d3':
recovery: Dump the signature in the zip package.
Change-Id: I22eb6256f3204f2eac80e729cd0cd5b862b45863
2016-04-22 23:49:53 +00:00
Tao Bao
34ca0892f4
Merge "recovery: Dump the signature in the zip package." into nyc-dev
2016-04-22 23:36:50 +00:00
Elliott Hughes
ba2d86ee1f
Merge "Go back to the old ear-wiggling Android animation. am: 692941be79 am: 87b0654f00" into nyc-mr1-dev-plus-aosp
...
am: 9ac7ff6b3c
* commit '9ac7ff6b3cfcbe981b30ea35c660b82872203039':
Change-Id: I3f03c5e2ff82a5de7dbf0843f014d7dc47b23290
2016-04-21 23:20:51 +00:00
Elliott Hughes
d134504db9
Go back to the old ear-wiggling Android animation. am: 692941be79 am: 17266d9a65
...
am: 43ce00e737
* commit '43ce00e7375fae5db66177552f973e317e6b7318':
Go back to the old ear-wiggling Android animation.
Change-Id: I24342c0d5f690fbc0b33dc6cdea42324376c6066
2016-04-21 23:20:50 +00:00
Android Build Merger (Role)
9ac7ff6b3c
Merge "Go back to the old ear-wiggling Android animation. am: 692941be79 am: 87b0654f00" into nyc-mr1-dev-plus-aosp
2016-04-21 23:18:40 +00:00
Elliott Hughes
cf05e364e7
Go back to the old ear-wiggling Android animation. am: 692941be79
...
am: 87b0654f00
* commit '87b0654f00d84b91cb42289a6229a8682831ed41':
Go back to the old ear-wiggling Android animation.
Change-Id: I0d87c52b7ecbf0488460045e1223011970ce3ce7
2016-04-21 23:18:35 +00:00
Elliott Hughes
43ce00e737
Go back to the old ear-wiggling Android animation. am: 692941be79
...
am: 17266d9a65
* commit '17266d9a653d8b896dfe6d69826e28352d5932bd':
Go back to the old ear-wiggling Android animation.
Change-Id: I7d6596e64dab3ee5ef92cc95237f89f4fbf037a2
2016-04-21 23:18:34 +00:00
Elliott Hughes
17266d9a65
Go back to the old ear-wiggling Android animation.
...
am: 692941be79
* commit '692941be79fd765f8873d810ae627a917dfd791b':
Go back to the old ear-wiggling Android animation.
Change-Id: Ifddb21173e55f9c690dbc0661308575d885f4e76
2016-04-21 23:16:20 +00:00
Elliott Hughes
87b0654f00
Go back to the old ear-wiggling Android animation.
...
am: 692941be79
* commit '692941be79fd765f8873d810ae627a917dfd791b':
Go back to the old ear-wiggling Android animation.
Change-Id: I7258a81b7068a98d005b98bd4c2bbad38485366d
2016-04-21 23:16:19 +00:00
Elliott Hughes
692941be79
Go back to the old ear-wiggling Android animation.
...
But keep the new code so we can easily test new animations when we have them.
This change includes tbao's de-interlace script, plus a one-liner that's
necessary to play the animation at the correct speed when there's no
progress bar showing. (This was always a bug, it's just way more noticeable
when your animation only has 7 frames.)
Bug: http://b/28316654
Bug: http://b/26548285
Change-Id: I32c601c352d6be235d1b44f14fca7e125defd77d
2016-04-21 14:26:14 -07:00
Tianjie Xu
f6326bbfc1
Merge "Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 4cc6145423" into nyc-mr1-dev-plus-aosp
...
am: 99f55506c5
* commit '99f55506c5c6b911ea6ece02a9d654af06349948':
Change-Id: I0a726788735a9be239aa36cc7a6363accda7ba51
2016-04-21 01:59:10 +00:00
Tianjie Xu
ce18b61f9b
Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 8bb3bd9209
...
am: d24d9e4944
* commit 'd24d9e494429d74089a2060e7500d52fd9b10f7c':
Regenerate background text imgs in recovery
Change-Id: I28f312bdfc24f3de0ea8fd3794f3e8e6c507158b
2016-04-21 01:59:10 +00:00
Android Build Merger (Role)
99f55506c5
Merge "Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 4cc6145423" into nyc-mr1-dev-plus-aosp
2016-04-21 01:08:08 +00:00
Tianjie Xu
d24d9e4944
Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512
...
am: 8bb3bd9209
* commit '8bb3bd9209f117ea6e3a0560b3c58334ea9fd2c4':
Regenerate background text imgs in recovery
Change-Id: If3d6ee82ccedbdf5856e49795633622e723b604e
2016-04-21 01:08:00 +00:00
Tianjie Xu
76734915c7
Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512
...
am: 4cc6145423
* commit '4cc61454239cd053e9d12e8de6df2878d30b9c72':
Regenerate background text imgs in recovery
Change-Id: I64145a026a91cddea95dec604fdbfe0abd03de55
2016-04-21 01:08:00 +00:00
Tianjie Xu
8bb3bd9209
Merge "Regenerate background text imgs in recovery" into nyc-dev
...
am: df093c1512
* commit 'df093c15121df40693519d2a1c703cf1684423d5':
Regenerate background text imgs in recovery
Change-Id: Ie70920503c5361c925cdaa55852e456fbd8830a7
2016-04-21 01:05:47 +00:00
Tianjie Xu
4cc6145423
Merge "Regenerate background text imgs in recovery" into nyc-dev
...
am: df093c1512
* commit 'df093c15121df40693519d2a1c703cf1684423d5':
Regenerate background text imgs in recovery
Change-Id: If4c878b2ffd03189107ed24e1cd3e9e88833024c
2016-04-21 01:05:46 +00:00
Tianjie Xu
df093c1512
Merge "Regenerate background text imgs in recovery" into nyc-dev
2016-04-21 00:55:51 +00:00
Tianjie Xu
f986f57b22
Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 210b0a5
...
am: d32182d
* commit 'd32182da0014b52cf23cc5865d7465b6eda99e6a':
Change-Id: I1adf6606782eb844d5993709715e463d3bb6efdf
2016-04-20 23:56:55 +00:00
Tianjie Xu
d32182da00
Merge "Fix matches_locale function" into nyc-dev am: 8b86373
...
am: 210b0a5
* commit '210b0a5a20830beea3b3e96e84c6b3fd2a626cf5':
Change-Id: I0ead2ccee7d8a2db4a2ac585a2054ee80abd569c
2016-04-20 23:26:00 +00:00