nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,145 Commits
1 Branch
0 Tags
363 MiB
Commit Graph

2246 Commits (24fc5ab65ff0cb53dea2d7beef3f7bbd64fcbbec)

Author SHA1 Message Date
Baligh Uddin e5ae0bd36a Import translations. DO NOT MERGE 
Change-Id: I90d5918cc37eaa6d3e19822e149a8a16b9d76744
Auto-generated-cl: translation import
 2013-04-30 03:55:36 -07:00
Tadashi G. Takaoka f4a03ddcf8 am 1187ef9a: Merge "Catch error while playing welcome video" 
* commit '1187ef9a9747ff2ed71101156f3f560eaa32772c':
  Catch error while playing welcome video
 2013-04-30 02:33:52 -07:00
Tadashi G. Takaoka 1187ef9a97 Merge "Catch error while playing welcome video" 2013-04-30 09:31:20 +00:00
Jean Chalard d618419d16 am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar" 
* commit '37bbaea8a15038406214fa8c9098cfcf4b2e2d9b':
  [PB14] Cosmetic fixes to the progress bar
 2013-04-30 02:22:20 -07:00
Jean Chalard 37bbaea8a1 Merge "[PB14] Cosmetic fixes to the progress bar" 2013-04-30 09:20:41 +00:00
Tadashi G. Takaoka ad46c9e0e0 Catch error while playing welcome video 
Bug: 8159728
Change-Id: Ic8eea7993f12395d6eca6db8d5529803251a9fee
 2013-04-30 18:18:32 +09:00
Jean Chalard 7eff677c29 [PB14] Cosmetic fixes to the progress bar 
Bug: 7600384
Change-Id: I33ea155c0c97c7ead07686c4d2a9e0d98be9929c
 2013-04-30 17:54:09 +09:00
Satoshi Kataoka f4d7c99cda am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary" 
* commit '71c1e50fdb47c78b3180cc6b04d4cababe3f3fe2':
  Fix the title of the fragment of the personal dictionary
 2013-04-30 00:13:02 -07:00
Satoshi Kataoka 71c1e50fdb Merge "Fix the title of the fragment of the personal dictionary" 2013-04-30 07:11:13 +00:00
Tadashi G. Takaoka 3bcc75456f am 965329c1: Fix missing string reference of spellchecker.xml 
* commit '965329c192ee385c83ccf9b054063f9a68cca34b':
  Fix missing string reference of spellchecker.xml
 2013-04-29 23:35:50 -07:00
Tadashi G. Takaoka 965329c192 Fix missing string reference of spellchecker.xml 
This is a followup of I8dea5393ad.

Change-Id: I311c50cf8205298f20694e068bb9a4b661df8a8b
 2013-04-30 15:31:58 +09:00
Satoshi Kataoka 5aa14c2636 Fix the title of the fragment of the personal dictionary 
This change is corresponding to I9b8bab21b144385bc2386e7fcb

Bug: 8600958
Change-Id: I0a0cf37d0a11c14a51dc63b2e4371facb34514d0
 2013-04-30 15:01:51 +09:00
Baligh Uddin ed9ef5a778 am af77854a: am 31a70de6: Import translations. DO NOT MERGE 
* commit 'af77854afce13fa54826cbe2c55745030621cb5a':
  Import translations. DO NOT MERGE
 2013-04-29 11:22:26 -07:00
Baligh Uddin 88a78cd0c6 Revert "Import translations. DO NOT MERGE" 
This reverts commit c641478352

Change-Id: Ibfdb00914e74239ed18982f7e264392e27ebccc4
 2013-04-27 02:50:44 +00:00
Baligh Uddin af77854afc am 31a70de6: Import translations. DO NOT MERGE 
* commit '31a70de6d22c9fd763d0e6dcc46e24be33838066':
  Import translations. DO NOT MERGE
 2013-04-26 16:43:47 -07:00
Baligh Uddin c641478352 Import translations. DO NOT MERGE 
Change-Id: If02e4938fef4c4b30e61ae967aed197873b2dc61
Auto-generated-cl: translation import
 2013-04-26 13:44:20 -07:00
Baligh Uddin 96b284afe1 Import translations. DO NOT MERGE 
Change-Id: I65a16c04a3e63881180231d8c04c6cea847269d3
Auto-generated-cl: translation import
 2013-04-26 13:39:42 -07:00
Baligh Uddin 31a70de6d2 Import translations. DO NOT MERGE 
Change-Id: Id6eb0824603681ad04462fc08c0dcf071efa1d72
Auto-generated-cl: translation import
 2013-04-26 13:38:16 -07:00
Jean Chalard fc26033c37 [PB11] Add a skeleton class for a self-updating progress bar 
Bug: 7600384
Change-Id: I55b51152dd9968a359af091bf309f0d406f63ec4
 2013-04-26 20:51:42 +09:00
Jean Chalard ab0c66b9d1 [PB10] Add a progress bar to display file download progress 
The progress bar is showing but doesn't show progress yet.

Bug: 7600384
Change-Id: I80debd3f4368e82e4184a6c638bdcc8e48ed2305
 2013-04-26 20:34:56 +09:00
Jean Chalard ae577ac1db Merge "Update dictionaries" 2013-04-26 11:28:08 +00:00
Jean Chalard d57a7748c1 Update dictionaries 
>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1366957492 <=> 1366974711
Body :
Added: ложись 100
Added: под 100
Added: посмотрю 100
Added: угу 100
Added: ух 100

>>> java/res/raw/main_ru.dict
Header :
  date : 1366957492 <=> 1366974711
Body :
Added: ложись 100
Added: под 100
Added: посмотрю 100
Added: угу 100
Added: ух 100

Change-Id: Ida39ea2cf25cd291554f3b2f3ce31f57dca24113
 2013-04-26 20:15:14 +09:00
Tadashi G. Takaoka be06bce18b Merge "Get rid of janky black box before the movie starts" 2013-04-26 09:38:54 +00:00
Tadashi G. Takaoka 732c93815a Get rid of janky black box before the movie starts 
Bug: 8159728
Change-Id: I1d0a01a05b3b694d21fdfdc246d1329ab829908d
 2013-04-26 18:26:12 +09:00
Jean Chalard 9a98ef6968 Merge "[ZF3] Add the option to block potentially offensive words" 2013-04-26 08:25:10 +00:00
Jean Chalard c03aaa1bde Merge "[ZF2] Read settings for profanity filtering." 2013-04-26 08:23:56 +00:00
Jean Chalard 1ff8b1ce3a Merge "Update dictionaries" 2013-04-26 07:50:07 +00:00
Jean Chalard 7ec72b80ed Update dictionaries 
Full diff too long: truncated

Summary diff
>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1366277083 <=> 1366957492
  version : 31 <=> 32
Contents :
  - Reinstate 2- and 3- letter words that were demoted to avoid
    bad space insertion (343 entries)
  - Add missing words as per b/6341908 and b/5674314
    (98 entries)

This has zero effect on the regression tests

Bug: 6341908
Bug: 5674314
Change-Id: Ifce268a7eab5edd264d963489187e975017f8b72
 2013-04-26 15:56:54 +09:00
Satoshi Kataoka adbafa1a9b Merge "Support ICS on the user dictionary settings" 2013-04-26 06:50:42 +00:00
Satoshi Kataoka dcef94165b Support ICS on the user dictionary settings 
Bug: 8600958
Change-Id: I50e9228afc7b04147eb7c4734d3145abe8859a30
 2013-04-26 15:48:08 +09:00
Tadashi G. Takaoka 4bb312c7f3 Merge "Add strings-appname.xml to AOSP Android Keyboard project" 2013-04-26 06:46:07 +00:00
Tadashi G. Takaoka 57372fd3da Remove graying animation of alt-code keys while typing 
Bug: 8727807
Change-Id: Idcc76dade3ceba5649666d795b6e4f94a161d748
 2013-04-26 14:55:46 +09:00
Tadashi G. Takaoka 842e245e6f Add strings-appname.xml to AOSP Android Keyboard project 
Change-Id: I8dea5393ad3b12c2398bbeb7f1040b66d82c9c35
 2013-04-26 14:01:41 +09:00
Jean Chalard df3ca0420b Fix deleting a dictionary 
When the user presses the "delete" button in the Add-on dictionary
interface, we send an empty dictionary to Latin IME as a dummy for
it to use instead of the pre-installed one.
The old "empty" placeholder was rejected by initial verification.
This one is still empty, but passes the check.

Bug: 7980985
Change-Id: I751bbf67d8078dd5fbdce1dd2f0db72a8207816d
 2013-04-25 22:39:22 +09:00
Jean Chalard d361dc841c [ZF3] Add the option to block potentially offensive words 
Bug: 7226877
Change-Id: I2171c946258468b0a39d6590c7af994ef25ba552
 2013-04-25 20:29:14 +09:00
Jean Chalard bb61293675 [ZF2] Read settings for profanity filtering. 
Bug: 7226877
Change-Id: Ie0c713e1eba1529c0b288a1e5011023a79bedd6b
 2013-04-25 20:29:14 +09:00
Jean Chalard 2d72590ced [PB7] Export animation code out of the preference 
Bug: 7600384
Change-Id: I8009b31d96646acd667db410b94e969daea91d52
 2013-04-25 18:37:01 +09:00
Satoshi Kataoka 30f0f3a92a Merge "Implement a functionality to add an entry to the user dictionary" 2013-04-25 06:04:08 +00:00
Satoshi Kataoka a79ba8a3d6 Implement a functionality to add an entry to the user dictionary 
Bug: 8600958

Change-Id: Ic472500406b9d54ec4052c490ee7cef62fc4e52a
 2013-04-25 14:55:07 +09:00
Jean Chalard 2cf450f482 [PB6] Encapsulate the buttons into a view 
Handling buttons directly in the preference causes large
problems of code readability and interface.  It's better to
have a class to manage the buttons and their animations
separately. This is feature-equivalent, and mostly
delegates stuff for now.

Bug: 7600384
Change-Id: Ia8da0ec68ffac84fc1d65e1760539a87a73fa776
 2013-04-25 12:25:25 +09:00
Baligh Uddin 8f4cad6f85 am 78e92b5c: Import translations. DO NOT MERGE 
* commit '78e92b5cd94f2fa582b43190002ac6e51a163032':
  Import translations. DO NOT MERGE
 2013-04-24 14:28:50 -07:00
Baligh Uddin 348e062a63 Import translations. DO NOT MERGE 
Change-Id: Iefa9cf774c772bc113d481199a0a9c564a0aba27
Auto-generated-cl: translation import
 2013-04-24 13:22:43 -07:00
Baligh Uddin 78e92b5cd9 Import translations. DO NOT MERGE 
Change-Id: Ic979ab299132925396513d01ece53a6dc02cfa80
Auto-generated-cl: translation import
 2013-04-24 13:17:41 -07:00
Tadashi G. Takaoka 46913aedb4 Merge "Add next axction to setup wizard" 2013-04-24 10:30:56 +00:00
Tadashi G. Takaoka b5d33059e0 Add next axction to setup wizard 
Bug: 8159728
Change-Id: Ia37ab32b63e4eda29bf1411719d00846525c278f
 2013-04-24 19:22:41 +09:00
Tadashi G. Takaoka b40a8c060f Merge "Tune setup wizard layout for landscape and tablet" 2013-04-24 09:30:59 +00:00
Tadashi G. Takaoka 5cd7211ce6 Tune setup wizard layout for landscape and tablet 
Bug: 8159728
Change-Id: Ic2206d50562d62578f8e5e50bbd3c36625dbafb7
 2013-04-24 18:22:47 +09:00
Satoshi Kataoka 70f2762e28 Make aggressive threshold really aggressive 
Bug: 8701480
Change-Id: If8242cfe61f3e56712fd6e25e36858cff7f0d177
 2013-04-24 17:49:56 +09:00
Tadashi G. Takaoka 81b4661f96 Add setup wizard indicator size resource 
This is a follow up of Ie8e058bc3c.

Bug: 8159728
Change-Id: I171fc99374789e69c15506c37970e6fcafbcb1e2
 2013-04-24 12:56:39 +09:00
Tadashi G. Takaoka e55ae3424a am 0e5b6384: Disable shadow of gesture trail (DO NOT MERGE) 
* commit '0e5b6384f3f6daf9c05a25e60a900da4d24e3913':
  Disable shadow of gesture trail (DO NOT MERGE)
 2013-04-23 16:51:47 -07:00
Baligh Uddin 6b87e270f7 am fc036454: Import translations. DO NOT MERGE 
* commit 'fc0364548979c2f881ce2fa0629205b8378a3a28':
  Import translations. DO NOT MERGE
 2013-04-23 03:51:31 -07:00
Tadashi G. Takaoka 9a289c08f2 Merge "Use resources for dimensions of setup wizard" 2013-04-23 08:22:28 +00:00
Tadashi G. Takaoka 586578b730 Merge "Disable shadow of gesture trail" 2013-04-23 08:21:53 +00:00
Tadashi G. Takaoka 0e5b6384f3 Disable shadow of gesture trail (DO NOT MERGE) 
Bug: 8689880
Change-Id: I908c22d362f2f6f07e5e04be14d3aaa749a8ac8e
 2013-04-23 17:21:22 +09:00
Tadashi G. Takaoka 2deb898582 Disable shadow of gesture trail 
Cherry-picked from JB-MR2 I908c22d362.

Bug: 8689880
Change-Id: Ie759c5d63056509e3ca61d9fb6823ab04ddf41ed
 2013-04-23 17:20:21 +09:00
Tadashi G. Takaoka 0bff16155a Use resources for dimensions of setup wizard 
This is a ground work to fit the setup wizard to smaller phones and
larger tablets.

Bug: 8159728
Change-Id: Ie8e058bc3cba30cac3b31eb5a3ce975f2ee311d9
 2013-04-23 17:18:34 +09:00
Tadashi G. Takaoka 4b7e0c5ac2 Merge "Remove wording "wizard" from setup application" 2013-04-23 07:57:18 +00:00
Tadashi G. Takaoka 864aeb1f50 Remove wording "wizard" from setup application 
Bug: 8676811
Bug: 8662102
Change-Id: Ie234d8871651344b6815ae68c8b1f0663a9f6c79
 2013-04-23 16:44:42 +09:00
Tadashi G. Takaoka 480284e28a Merge "Add edit personal dictionary settings menu" 2013-04-23 06:01:45 +00:00
Baligh Uddin f595a0626d Import translations. DO NOT MERGE 
Change-Id: Ib14aef97ea78806e1560fbd3d3e1f40f01bf8c0a
Auto-generated-cl: translation import
 2013-04-22 14:13:10 -07:00
Baligh Uddin fc03645489 Import translations. DO NOT MERGE 
Change-Id: I58c4fff8e92f66f7e85446d6fd05e61e3f081aca
Auto-generated-cl: translation import
 2013-04-22 14:07:22 -07:00
Satoshi Kataoka 434abe450c am 9b4e3db1: Legal notice 
* commit '9b4e3db1afb9cfb089aa81e87075cdc8e2740a87':
  Legal notice
 2013-04-22 07:26:11 -07:00
Satoshi Kataoka 9b4e3db1af Legal notice 
Bug: 8533258
Change-Id: I00e4916f86f29dd476c51a65e8fa5a6c136fd179
 2013-04-22 21:55:53 +09:00
Tadashi G. Takaoka 4f2535398a Add edit personal dictionary settings menu 
Bug: 8600958
Change-Id: I303adfbe25a56cc9b5ee9f3b5169a5bca0ad6c4a
 2013-04-22 19:59:12 +09:00
Tadashi G. Takaoka 6bbe685893 am 0f07935e: Centering setup wizard welcome video 
* commit '0f07935e5165b33d512d7d594e5fec7a2f210013':
  Centering setup wizard welcome video
 2013-04-22 00:31:24 -07:00
Tadashi G. Takaoka 0f07935e51 Centering setup wizard welcome video 
Bug: 8159728
Change-Id: Ia016c41dc39b87740ff57efe0e2fadd61f0da129
 2013-04-22 12:23:32 +09:00
Ken Wakasa 727975009f am 2a9b5447: am a56c7020: am d4ab58a0: Add translatable="false" for appropriate entries 
* commit '2a9b5447fa87daa70c45ecf0f038271ed7a92813':
  Add translatable="false" for appropriate entries
 2013-04-19 10:13:47 -07:00
Ken Wakasa 2a9b5447fa am a56c7020: am d4ab58a0: Add translatable="false" for appropriate entries 
* commit 'a56c702088055823bd755d2aafe13965b12785ed':
  Add translatable="false" for appropriate entries
 2013-04-19 10:11:40 -07:00
Ken Wakasa a56c702088 am d4ab58a0: Add translatable="false" for appropriate entries 
* commit 'd4ab58a0f7bdf5aee51947607e1b17998912285c':
  Add translatable="false" for appropriate entries
 2013-04-19 10:09:50 -07:00
Tadashi G. Takaoka ab11dbe8f3 am b8ff89c8: Remove translatable="false" from setup wizard strings 
* commit 'b8ff89c809dabc46df9ee683c6064f67ee432213':
  Remove translatable="false" from setup wizard strings
 2013-04-19 05:11:30 -07:00
Tadashi G. Takaoka b8ff89c809 Remove translatable="false" from setup wizard strings 
Change-Id: Ie2f53910ce91f8c288e83c4ea15dc51aafd4c6a2
 2013-04-19 21:07:17 +09:00
Tadashi G. Takaoka c35e0e6a4b am 42afa82d: Support landscape orientation for setup wizard 
* commit '42afa82d54f10d7faf8c4ba50516dd450606f98b':
  Support landscape orientation for setup wizard
 2013-04-19 04:55:55 -07:00
Tadashi G. Takaoka b3663df582 am 68e4de1e: Add welcome screen to setup wizard 
* commit '68e4de1e78c62802fb18be120d58646ca35fe320':
  Add welcome screen to setup wizard
 2013-04-19 04:55:53 -07:00
Tadashi G. Takaoka 42afa82d54 Support landscape orientation for setup wizard 
Bug: 8159728
Change-Id: Ic0f73a7ebfea6e5e98aa320eb1ebc2a677271665
 2013-04-19 20:53:40 +09:00
Tadashi G. Takaoka 68e4de1e78 Add welcome screen to setup wizard 
This is a preliminary implementation because the welcome screen video
is just a placeholder.

Bug: 8159728
Change-Id: I6a2459a266babec2f078fc393b18c77b0b7992a8
 2013-04-19 20:49:49 +09:00
Tadashi G. Takaoka baa1e14da1 am fcefabf9: Groundwork to implement landscape and welcome screen 
* commit 'fcefabf9abafc867ae858160169bb1cd19981e07':
  Groundwork to implement landscape and welcome screen
 2013-04-19 04:24:48 -07:00
Tadashi G. Takaoka fcefabf9ab Groundwork to implement landscape and welcome screen 
Bug: 8159728
Change-Id: I05ff6578980ec2e210ebb482ea51b1600e74a4f4
 2013-04-19 20:10:59 +09:00
Tadashi G. Takaoka 82a7b185bb am 16ec2e11: Merge "Add finish action to setup wizard" 
* commit '16ec2e1155a0152c6ded42bc8941b90b7cd08d35':
  Add finish action to setup wizard
 2013-04-19 04:01:19 -07:00
Tadashi G. Takaoka 192743a6ae Add finish action to setup wizard 
Bug: 8159728
Change-Id: I1578fc31875a1edbfea213fb5e1a1b464d02e941
 2013-04-19 19:44:54 +09:00
Ken Wakasa d4ab58a0f7 Add translatable="false" for appropriate entries 
bug: 8662567
Change-Id: I1ac9b4b8834f3b0ea537ad3142fa533dea10f23e
 2013-04-19 19:37:59 +09:00
Tadashi G. Takaoka fc2ca29d71 am f10046bd: Remove ScrollView from setup wizard 
* commit 'f10046bddc78c939c53236fb94ebaf413d108b11':
  Remove ScrollView from setup wizard
 2013-04-18 22:51:15 -07:00
Tadashi G. Takaoka ed0d1156f7 am 30f102e2: Move some attributes of setup wizard layouts to style files 
* commit '30f102e297d4e4afc28b3aad688fe72e814452e7':
  Move some attributes of setup wizard layouts to style files
 2013-04-18 20:49:01 -07:00
Tadashi G. Takaoka f10046bddc Remove ScrollView from setup wizard 
Change-Id: I85f089301d1be8ed789a20049d21e2c371cad1c5
 2013-04-19 12:45:47 +09:00
Tadashi G. Takaoka 30f102e297 Move some attributes of setup wizard layouts to style files 
Change-Id: I7b5999253c959531212ee27ac1ddfe39de280e2c
 2013-04-19 12:43:40 +09:00
Tadashi G. Takaoka ae19f170ba am 1f6e06cf: Merge "Make setup wizard step number highlighted when activated" 
* commit '1f6e06cf9244cdd8803ee653f948e169c190b067':
  Make setup wizard step number highlighted when activated
 2013-04-18 20:24:11 -07:00
Tadashi G. Takaoka 1f6e06cf92 Merge "Make setup wizard step number highlighted when activated" 2013-04-19 03:21:04 +00:00
Tadashi G. Takaoka 7158438a64 am 88ee052c: Merge "Update strings of setup wizard" 
* commit '88ee052c10a08bc48f40074583b64e5ebc43fdee':
  Update strings of setup wizard
 2013-04-18 20:18:54 -07:00
Tadashi G. Takaoka 88ee052c10 Merge "Update strings of setup wizard" 2013-04-19 03:16:46 +00:00
Tadashi G. Takaoka 411fd9bd02 Update strings of setup wizard 
Bug: 8159728
Change-Id: I34ef461410f4ebd4a3869c3614318581d48fdef5
 2013-04-19 11:16:06 +09:00
Tadashi G. Takaoka b84c0468e4 Make setup wizard step number highlighted when activated 
Bug: 8159728
Change-Id: I62ccbebaae0a0c4a93ad7c155fc3020a7f357f3c
 2013-04-19 11:14:21 +09:00
Baligh Uddin 04211b9112 am dcc59297: am 1844bec2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'dcc59297ac97c2ae7791ab09c535927c93c607fb':
  Import translations. DO NOT MERGE
 2013-04-18 09:46:34 -07:00
Baligh Uddin dcc59297ac am 1844bec2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '1844bec2024859f1c8dbc331893a74d5af9152d8':
  Import translations. DO NOT MERGE
 2013-04-18 09:42:23 -07:00
Baligh Uddin 3f4d2105db Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-04-18 16:39:51 +00:00
Baligh Uddin 1844bec202 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-18 16:39:35 +00:00
Jean Chalard 0e64fbbcac am 9cf46864: Update dictionaries 
* commit '9cf468646fe3c0ce1ed1b360068dc128f7d9518b':
  Update dictionaries
 2013-04-18 04:52:04 -07:00
Jean Chalard 9cf468646f Update dictionaries 
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1366021966 <=> 1366272052
Body :
Added: yt 0

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1366021978 <=> 1366272093
Body :
Added: yt 0

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1366021987 <=> 1366272977
Body :
Added: yt 0

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1366003217 <=> 1366272255
Body :
Freq changed: cash 80 -> 20

>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1366003693 <=> 1366277083
Body :
Deleted: толщ 76

>>> java/res/raw/main_en.dict
Header :
  date : 1366021987 <=> 1366272977
Body :
Added: yt 0

>>> java/res/raw/main_fr.dict
Header :
  date : 1366003217 <=> 1366272255
Body :
Freq changed: cash 80 -> 20

>>> java/res/raw/main_ru.dict
Header :
  date : 1366003693 <=> 1366277083
Body :
Deleted: толщ 76

Bug: 8635822
Change-Id: I44dc73bd010b125c994387894847a008276d69f7
 2013-04-18 18:41:19 +09:00
Tadashi G. Takaoka 64e87b3e66 am 0b2d184a: Merge "Update setup wizard icons" 
* commit '0b2d184a426f49c115ea55098ae6073ccd7d6a94':
  Update setup wizard icons
 2013-04-17 23:59:41 -07:00
Tadashi G. Takaoka 0b2d184a42 Merge "Update setup wizard icons" 2013-04-18 06:56:24 +00:00
Tadashi G. Takaoka d794f5ae2a Update setup wizard icons 
Bug: 8159728
Change-Id: Ia5a14a35292b43dc1eaa2d4edd65134040355149
 2013-04-18 13:15:53 +09:00
Baligh Uddin c2e36a8fc2 am 97aa9c40: am a5506b53: am bfedad23: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '97aa9c4059c41395b6ad550a3e8dfb4a7b66a83b':
 2013-04-17 19:50:51 -07:00