Tadashi G. Takaoka
28c02b400f
Add go to "Settings" button to important notice dialog
...
This CL also
- removes icons on important notice title.
- changes the "Personalized suggestions" summary text.
This change must be checked in together with Id115d89ba9.
Bug: 10587358
Change-Id: I52ff26fa8ae12445e9014ba08253f69e1be609f4
2014-02-17 14:57:04 +09:00
Baligh Uddin
a973e0926a
Import translations. DO NOT MERGE
...
Change-Id: Ibf72865a393c8e5e41ef6420e7131bbcddfb18e5
Auto-generated-cl: translation import
2014-02-12 16:04:35 -08:00
Baligh Uddin
d8e4928372
Import translations. DO NOT MERGE
...
Change-Id: I55e2d607627ba6f1f27c8cc60ffe8416f250638e
Auto-generated-cl: translation import
2014-02-10 17:55:21 -08:00
Geoff Mendal
2212385061
Import translations. DO NOT MERGE
...
Change-Id: Ib99535e93fac58d7e5b22595015096b7be9d0d98
Auto-generated-cl: translation import
2014-02-05 16:55:40 -08:00
Geoff Mendal
6c88544f95
Import translations. DO NOT MERGE
...
Change-Id: I7b3358893fca57f1ddc457c74daff9b3b2eb2ee4
Auto-generated-cl: translation import
2014-02-03 19:17:35 -08:00
Geoff Mendal
5802fb05a8
Import translations. DO NOT MERGE
...
Change-Id: I9d276ae4391f209e2db3a080b3221e5a8aa59938
Auto-generated-cl: translation import
2014-01-15 16:42:37 -08:00
Tadashi G. Takaoka
7504913807
Move phrase gesture related string resources to AOSP
...
This change must be checked in together with Ica8fc5135.
Change-Id: I288d7083391954f1266a9b77ee4ffc0bc9d4229d
2014-01-14 17:15:41 +09:00
Baligh Uddin
941a4540bc
Import translations. DO NOT MERGE
...
Change-Id: Ia2d0f4528529df463307e1706cd4d7265b3958c1
Auto-generated-cl: translation import
2014-01-08 13:45:51 -08:00
Baligh Uddin
f75017de55
Import translations. DO NOT MERGE
...
Change-Id: Ia0ef830a5bb3ed6fee1a5d113b2baec60bb51a97
Auto-generated-cl: translation import
2014-01-07 07:27:26 -08:00
Baligh Uddin
4f878a71b9
Import translations. DO NOT MERGE
...
Change-Id: Iec55106743e61ca92f934f1280b0faf0bb2f4b1b
Auto-generated-cl: translation import
2013-12-19 14:18:14 -08:00
Baligh Uddin
2ea0d56fb5
Import translations. DO NOT MERGE
...
Change-Id: Iad038e310497a74f167e7f6cfda1f3bee6cd8f09
Auto-generated-cl: translation import
2013-12-16 17:37:20 -08:00
Ken Wakasa
2fa3693c26
Reset to 9bd6dac470
...
The bulk merge from -bayo to klp-dev should not have been merged to master.
Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
2013-12-13 17:13:32 +09:00
Baligh Uddin
b4cc0ae075
Import translations. DO NOT MERGE
...
This is a manual cherry-pick of Ib0c14a756a. This change also copied
some missing locales' strings.xml and strings-action-keys.xml from
jb-ub-latinimegoogle branch.
Bug: 11622614
Change-Id: Ibc9cde4662b15da63b73ac2b545e0e94c358de67
2013-11-21 11:28:47 +09:00
Baligh Uddin
4d4fe3eb5e
Import translations. DO NOT MERGE
...
Change-Id: I04aed3599ff9570197b408a5d16ea48422294f97
Auto-generated-cl: translation import
2013-10-04 22:46:44 -07:00
Baligh Uddin
2b361d95a6
Import translations. DO NOT MERGE
...
Change-Id: I50e530351c75746759fefc4113c4f881755405ec
Auto-generated-cl: translation import
2013-10-04 09:03:13 -07:00
Baligh Uddin
e1e6819a4c
Import translations. DO NOT MERGE
...
Change-Id: Ifee5f65e8da896db6bce982db0c8cdcbb3f49902
Auto-generated-cl: translation import
2013-10-02 21:40:31 -07:00
Baligh Uddin
985e6d7fc9
Import translations. DO NOT MERGE
...
Change-Id: I01400792a62f3f5bb11794b32930e788fa0af045
Auto-generated-cl: translation import
2013-09-30 19:01:45 -07:00
Baligh Uddin
4bb220a3ed
Import translations. DO NOT MERGE
...
Change-Id: Ib53afdebb4015320dc18065011d9beba3f03e1d0
Auto-generated-cl: translation import
2013-09-03 18:52:47 -07:00
Baligh Uddin
434fd2929d
Import translations. DO NOT MERGE
...
Change-Id: If347fd994085b7633856ff621898cc8ba678ada8
Auto-generated-cl: translation import
2013-08-29 05:15:30 -07:00
Baligh Uddin
dc511a3f0a
Import translations. DO NOT MERGE
...
Change-Id: Ic98e1061acd3abf96e1f594c6b9ba79a0664a169
Auto-generated-cl: translation import
2013-08-12 15:19:33 -07:00
Baligh Uddin
f8c8140106
Import translations. DO NOT MERGE
...
Change-Id: I1a07b23ba76af93435bc8305c20edfd23c51114c
Auto-generated-cl: translation import
2013-08-06 02:24:54 -07:00
Jean Chalard
965b7266c2
Fix a typo
...
Change-Id: Ie724a444ce056ee43b7ca2f10f30cce5843e61ad
2013-08-05 18:13:29 +09:00
Baligh Uddin
d2f0d82220
Import translations. DO NOT MERGE
...
Change-Id: I17e9ad751b1e628c8a60bc2234180a37716d10e9
Auto-generated-cl: translation import
2013-06-24 22:02:24 -07:00
Baligh Uddin
d5e245bcaa
Import translations. DO NOT MERGE
...
Change-Id: Ic7508cb2b5098403786af2f2e220d908dab51e8d
Auto-generated-cl: translation import
2013-06-19 15:50:15 -07:00
Baligh Uddin
dd8197bcb2
Import translations. DO NOT MERGE
...
Change-Id: I838674303010d6bff9e3a6f747fd265d1c82baac
Auto-generated-cl: translation import
2013-05-03 16:52:20 -07:00
Baligh Uddin
3985e632ad
Import translations. DO NOT MERGE
...
Change-Id: I3f66d23846516560e3a1e316cf56dc7a17dfe9e2
Auto-generated-cl: translation import
2013-05-01 14:35:47 -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
c641478352
Import translations. DO NOT MERGE
...
Change-Id: If02e4938fef4c4b30e61ae967aed197873b2dc61
Auto-generated-cl: translation import
2013-04-26 13:44:20 -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
f595a0626d
Import translations. DO NOT MERGE
...
Change-Id: Ib14aef97ea78806e1560fbd3d3e1f40f01bf8c0a
Auto-generated-cl: translation import
2013-04-22 14:13:10 -07:00
Baligh Uddin
f2ab0adc5e
Import translations. DO NOT MERGE
...
Change-Id: Ie74fdb8041ac5d7eb5d15a49f9aac834751cc9c2
Auto-generated-cl: translation import
2013-04-12 13:19:32 -07:00
Baligh Uddin
58df3cfaee
Import translations. DO NOT MERGE
...
Change-Id: Iafc0a5506abef8e709d76ebf4600bacae7dd1e00
Auto-generated-cl: translation import
2013-04-10 13:21:21 -07:00
Baligh Uddin
990113c750
Import translations. DO NOT MERGE
...
Change-Id: Ib805aeefe668e6c2d79d64dad8c14cbd7d633f46
Auto-generated-cl: translation import
2013-03-29 21:22:11 -07:00
Baligh Uddin
1af30bab94
Import translations. DO NOT MERGE
...
Change-Id: I31bcd942f18166658143b4dbd5695f66f4717a22
Auto-generated-cl: translation import
2013-03-22 13:32:54 -07:00
Satoshi Kataoka
3c8117c88f
Fix appname
...
Bug: 6789579
Change-Id: Ic4694e36e0846af95fa8dcdef919be251983b528
2013-03-22 16:19:44 +09:00
Jean Chalard
3c5b7d4814
am 6d90a10a: am 0cc0544a: Merge the dictionary pack in Latin IME.
...
* commit '6d90a10a343723b8613fd22d323c586ecc33b284':
Merge the dictionary pack in Latin IME.
2013-03-19 01:15:12 -07:00
Jean Chalard
0cc0544a29
Merge the dictionary pack in Latin IME.
...
Bug: 8161354
Change-Id: I17c23f56dd3bc2f27726556bf2c5a9d5520bd172
2013-03-19 15:40:14 +09:00
Baligh Uddin
7f0aaaef7c
Import translations. DO NOT MERGE
...
Change-Id: Idf34e25ce4d5c162955b70c53c105f87486a7ff6
Auto-generated-cl: translation import
2013-03-12 13:08:49 -07:00
Baligh Uddin
e1720957b5
Import translations. DO NOT MERGE
...
Change-Id: I478c5e0ec19d0d1f1835826606f7736059e7795c
Auto-generated-cl: translation import
2013-03-12 13:07:57 -07:00
Baligh Uddin
fa0f05487e
Import translations. DO NOT MERGE
...
Change-Id: If6d46dc75d94094554f018a3bc20d20363cab21a
Auto-generated-cl: translation import
2013-03-01 12:12:24 -08:00
Baligh Uddin
7d2e465ac0
Import translations. DO NOT MERGE
...
Change-Id: I1852e989314ddd2e3f806486a0774ffe446473e8
Auto-generated-cl: translation import
2013-03-01 12:11:04 -08:00
Baligh Uddin
32081df5d8
Import translations. DO NOT MERGE
...
Change-Id: I14643d519433db75403b8a7f5b9a409e316c1f1e
Auto-generated-cl: translation import
2013-02-27 12:25:14 -08:00
Baligh Uddin
beae302efe
Import translations. DO NOT MERGE
...
Change-Id: I75753bfe196bf52c7ec5534ce1996e035ea0f956
Auto-generated-cl: translation import
2013-02-22 10:51:10 -08:00
Baligh Uddin
7a54c7a52d
Import translations. DO NOT MERGE
...
Change-Id: I86cb41c3f86a29bac9a3f93b6692e3f787156fdd
Auto-generated-cl: translation import
2013-02-22 10:46:46 -08:00
Baligh Uddin
69cc3cfe1f
Import translations. DO NOT MERGE
...
Change-Id: I49fbafa8f9ef932fe4d2354c83fa86514726bb00
Auto-generated-cl: translation import
2013-02-12 13:33:27 -08:00
Baligh Uddin
f60fad3987
Import translations. DO NOT MERGE
...
Change-Id: Ic418597418363ba57704b6d44ea33a862fbc621e
Auto-generated-cl: translation import
2013-02-12 13:28:55 -08:00
Baligh Uddin
d069d67038
Import translations. DO NOT MERGE
...
Change-Id: Ibd74870cf9822bce34f54504972e8f7d52c43036
Auto-generated-cl: translation import
2013-02-11 10:23:54 -08:00
Baligh Uddin
d4ca979165
Import translations. DO NOT MERGE
...
Change-Id: If167e26b62d1fa89e672da77fbcde015659e635f
Auto-generated-cl: translation import
2013-02-11 10:18:58 -08:00
Baligh Uddin
074e1ac422
Import translations. DO NOT MERGE
...
Change-Id: I385b565d8b768795e2917cb3726dae8cbb7d3ebd
Auto-generated-cl: translation import
2013-02-01 09:45:20 -08:00
Baligh Uddin
fe73a0f6f4
Import translations. DO NOT MERGE
...
Change-Id: Id2aa005657ac474635219de81758b71c39e6d9ff
Auto-generated-cl: translation import
2013-02-01 09:41:30 -08:00
Baligh Uddin
542083fc04
Import translations. DO NOT MERGE
...
Change-Id: I7abda81fe11b1faa8a82ed42609c5dfa7a62a318
Auto-generated-cl: translation import
2013-01-30 12:07:02 -08:00
Baligh Uddin
15f3470216
Import translations. DO NOT MERGE
...
Change-Id: Ic2e0cee92c82d2b1f9c225ce321c32a51953968c
Auto-generated-cl: translation import
2013-01-30 12:02:09 -08:00
Baligh Uddin
56012e5ab9
Revert "Import translations. DO NOT MERGE"
...
broken build.
This reverts commit 2c77683281
Change-Id: I2abbb8f148990a7778c8782834b5996b52e45dbe
2013-01-28 19:12:04 +00:00
Baligh Uddin
2c77683281
Import translations. DO NOT MERGE
...
Change-Id: Ia29e0c424e5210919bc6f9c4683a2c96e2936cad
Auto-generated-cl: translation import
2013-01-28 09:49:30 -08:00
Baligh Uddin
e7dec3592d
Import translations. DO NOT MERGE
...
Change-Id: I38345ff37dbce7cf5323ddc14e77378e5f1631cc
Auto-generated-cl: translation import
2013-01-28 09:44:27 -08:00
Baligh Uddin
ab54e47fbe
Import translations. DO NOT MERGE
...
Change-Id: I2df467fe9c740e33d2346dd09f5696c95af99aa5
Auto-generated-cl: translation import
2013-01-23 13:00:15 -08:00
Baligh Uddin
ad4cacafc6
Import translations. DO NOT MERGE
...
Change-Id: I46c30138504fab476bcca30cd4cc83ba108f959e
Auto-generated-cl: translation import
2013-01-22 10:40:33 -08:00
Baligh Uddin
02a2a11ad8
Import translations. DO NOT MERGE
...
Change-Id: Id03f543eee557ac2eae4333c411fc7d14fecdca7
Auto-generated-cl: translation import
2013-01-22 10:34:46 -08:00
Baligh Uddin
68c7514ec7
Import translations. DO NOT MERGE
...
Change-Id: I8b9113b6328fa461d8184ff3d2bc03379d1c7e3a
Auto-generated-cl: translation import
2013-01-07 11:33:41 -08:00
Baligh Uddin
c961514e83
Import translations. DO NOT MERGE
...
Change-Id: I28702033361341341f341afdd6db881004234b20
Auto-generated-cl: translation import
2013-01-07 11:28:23 -08:00
Baligh Uddin
694b71eddd
Import translations. DO NOT MERGE
...
Change-Id: Iadfb1d9dcb28cfd8f0d6d9891bbde89f8647fe48
Auto-generated-cl: translation import
2013-01-02 14:24:33 -08:00
Baligh Uddin
cb5f364d50
Import translations. DO NOT MERGE
...
Change-Id: Ibb06e9e95e2a3bec815f89d6d1154c8f9e1107f4
Auto-generated-cl: translation import
2013-01-02 14:19:24 -08:00
Baligh Uddin
e5a306831d
Import translations. DO NOT MERGE
...
Change-Id: I79b5cd68250ee30f66803400420cd1bfa22642e7
Auto-generated-cl: translation import
2012-12-13 12:12:28 -08:00
Baligh Uddin
6106553cdb
Import translations. DO NOT MERGE
...
Change-Id: I58479b3df35b63d9552ad2a4d0d7fa7e56d52435
Auto-generated-cl: translation import
2012-12-13 12:08:11 -08:00
Baligh Uddin
ae25e2c408
Import translations. DO NOT MERGE
...
Change-Id: Iec4037b7d6e6d13dbc057f7d5fcd94785a63b542
Auto-generated-cl: translation import
2012-12-06 10:59:24 -08:00
Baligh Uddin
860ab5116a
Import translations. DO NOT MERGE
...
Change-Id: I9acdbc6cfa0138724b578a47e733d7ff9624fecb
Auto-generated-cl: translation import
2012-12-06 10:55:13 -08:00
Baligh Uddin
88dcc967e7
Import translations. DO NOT MERGE
...
Change-Id: I0b3b03ce1974fba5f25fef74fa1937dce83b102f
Auto-generated-cl: translation import
2012-12-04 12:40:51 -08:00
Baligh Uddin
dc59cef1d1
Import translations. DO NOT MERGE
...
Change-Id: I790e811368b8c5aa403ed58c50628911be2af6b0
Auto-generated-cl: translation import
2012-12-04 11:38:40 -08:00
Satoshi Kataoka
9c739939a3
Add missing res dir
...
Change-Id: I50e79bbb1f2eab33c7e5a76086bbe41f7e757ada
2012-11-06 13:49:17 +09:00
Satoshi Kataoka
555e15a96a
Merge remote-tracking branch 'goog/master' into mergescriptpackage
...
Conflicts:
java/res/values-ca/strings.xml
java/res/values-cs/strings.xml
java/res/values-de/strings.xml
java/res/values-es/strings.xml
java/res/values-hr/strings.xml
java/res/values-hu/strings.xml
java/res/values-it/strings.xml
java/res/values-lv/strings.xml
java/res/values-nb/strings.xml
java/res/values-nl/strings.xml
java/res/values-pl/strings.xml
java/res/values-pt/strings.xml
java/res/values-ro/strings.xml
java/res/values-ru/strings.xml
java/res/values-sv/strings.xml
java/res/values-sw/strings.xml
java/res/values-tr/strings.xml
java/res/values-uk/strings.xml
java/res/values-zh-rCN/strings.xml
java/res/values-zh-rTW/strings.xml
java/src/com/android/inputmethod/latin/RichInputConnection.java
Change-Id: Iba00dd5b86cb16d72968bc7e40d75853845b6dcb
2012-11-06 12:49:53 +09:00
Baligh Uddin
741d6eaf17
Import translations. DO NOT MERGE
...
Change-Id: I64e38d5f0be5a47923642af0bc0146765e094b77
Auto-generated-cl: translation import
2012-10-04 15:34:17 -07:00
Baligh Uddin
689d429ae5
Import translations. DO NOT MERGE
...
Change-Id: I28c286b7ebf62d5c4b3fef8aea6d875f5a45d59c
Auto-generated-cl: translation import
2012-10-04 15:30:47 -07:00
Baligh Uddin
9c64c5342c
Import translations. DO NOT MERGE
...
Change-Id: Ib35cdfadea03c46e9a71404e79b4a509526f4896
Auto-generated-cl: translation import
2012-10-02 17:14:45 -07:00
Baligh Uddin
64b916562e
Import translations. DO NOT MERGE
...
Change-Id: I610d661b126ec5e7f5f0a3e28d68f0e69d5b3f68
Auto-generated-cl: translation import
2012-10-01 16:13:23 -07:00
Baligh Uddin
d7d43d586f
Import translations. DO NOT MERGE
...
Change-Id: Icd0176aec15c7c1baf023737ddec4d39857d695f
Auto-generated-cl: translation import
2012-09-26 19:34:00 -07:00
Baligh Uddin
53ab511d63
Import translations. DO NOT MERGE
...
Change-Id: I1d6d6860c14e16d64783a4d6bac8da5c196d02f3
Auto-generated-cl: translation import
2012-09-25 16:56:59 -07:00
Baligh Uddin
2a3c3f003d
Import translations. DO NOT MERGE
...
Change-Id: If5e5255f785a405d10439788916fe8b56ab43c37
Auto-generated-cl: translation import
2012-09-25 16:54:18 -07:00
Baligh Uddin
6f181f47bf
Import translations. DO NOT MERGE
...
Change-Id: Iac5c7f46bc6e39a71fcba5edad6c476c6ada05bf
Auto-generated-cl: translation import
2012-09-20 18:22:21 -07:00
Baligh Uddin
d1ed47e961
Import translations. DO NOT MERGE
...
Change-Id: Ia88ae1f26b7e65a5624e726d328b16af8b13c0db
Auto-generated-cl: translation import
2012-09-20 18:18:58 -07:00
Tadashi G. Takaoka
82902e7671
Add boolean resource isDefault=true for all supported locales
...
Bug: 7115368
Change-Id: I390d52d10d6c7d1639f73255ace9985886ea2157
2012-09-13 15:56:35 +09:00
Ken Wakasa
d3a9b70307
Cosmetic cleanup
...
Change-Id: I5e95440019f58c606ac2e947c6e0cbd4d51f6522
2012-09-06 01:13:12 +09:00
Ying Wang
2ca0f26237
Import translations. DO NOT MERGE
...
Change-Id: Ifdbe0c41f5e01c4afc155ea68c05d50d483e5749
Auto-generated-cl: translation import
2012-08-01 14:58:52 -07:00
Ying Wang
ff2bec1ce6
Import translations. DO NOT MERGE
...
Change-Id: I4495669f10f41c2c7c3877c65b061df6a2c9f196
Auto-generated-cl: translation import
2012-07-30 14:54:31 -07:00
Ying Wang
467f829bc8
Import translations. DO NOT MERGE
...
Change-Id: I5ea8afadae2ea6b08ef195f6f39e69117dd304ac
Auto-generated-cl: translation import
2012-07-23 13:57:53 -07:00
Ying Wang
2d097dd567
Import translations. DO NOT MERGE
...
Change-Id: Ie15a817f13d3ce0a87eeff8334824fd3a337c1bc
Auto-generated-cl: translation import
2012-07-20 13:28:37 -07:00
Ying Wang
71b772ec58
Import translations. DO NOT MERGE
...
Change-Id: I4ba29a164c70eb3db5afbb502a81d32088813ba4
Auto-generated-cl: translation import
2012-07-18 17:05:01 -07:00
Ying Wang
63b12362d6
Import translations. DO NOT MERGE
...
Change-Id: Ibb5bd0c2753e52dc3526ce859b0c108e189a605d
Auto-generated-cl: translation import
2012-07-13 13:52:11 -07:00
Ying Wang
8f7f04fead
Import translations. DO NOT MERGE
...
Change-Id: I056d8d8d630a2b3576462f7900bc39a7f19f5aa0
Auto-generated-cl: translation import
2012-07-11 15:33:02 -07:00
Ying Wang
59205dd270
Import translations. DO NOT MERGE
...
Change-Id: I48fd690e9368a6637c7fa93c15b6ecadcbe47ce8
Auto-generated-cl: translation import
2012-07-09 13:56:48 -07:00
Ying Wang
26c45718a5
Import translations. DO NOT MERGE
...
Change-Id: I1c7b1b7877fdbf6963b7a034a8ec197004f97b0e
Auto-generated-cl: translation import
2012-06-29 14:05:31 -07:00
Ying Wang
ca5449bf4f
Import translations. DO NOT MERGE
...
Change-Id: I3d022f22729b758a73352f0e7361e3aead0ef062
2012-06-27 17:16:15 -07:00
Eric Fischer
74d36bc8af
Import translations. DO NOT MERGE
...
Change-Id: I2ab623c74a6c9b45558af0241dbd985e851428cd
2012-06-11 14:17:49 -07:00
Eric Fischer
43a7a82728
Import translations. DO NOT MERGE
...
Change-Id: I6cad8f4ae58eeb08d8a29137987cb3da60019844
2012-06-07 15:52:50 -07:00
Eric Fischer
2efdf6a09f
Import translations. DO NOT MERGE
...
Change-Id: I7718b03a6f995edfb3cce07f761a4f56d573aa1b
2012-06-06 14:06:59 -07:00
Eric Fischer
494f9fe03d
Import translations. DO NOT MERGE
...
Change-Id: Ie481f0958f930eeadfd160ff3725cec70c9a452c
2012-06-01 13:06:42 -07:00
Eric Fischer
3b4d2725f4
Import translations. DO NOT MERGE
...
Change-Id: Ia904839525f03eaa58e040bef5cea1e979ea2b5c
2012-05-30 14:21:42 -07:00
Eric Fischer
4c4fd10d91
Import translations. DO NOT MERGE
...
Change-Id: Ia9a8ccaa502e31e49abff2392d5ac4971dcf3789
2012-05-16 14:36:12 -07:00
Eric Fischer
7857f9cdbc
Import translations. DO NOT MERGE
...
Change-Id: I978772894aef377eb117d5189b5dbe9f6f27f14f
2012-05-11 15:52:01 -07:00
Eric Fischer
5e8d20e487
Import translations. DO NOT MERGE
...
Change-Id: I0a068efa8f0027f7da9c5f418e2dc27f00d85ac7
2012-05-07 14:42:40 -07:00
Eric Fischer
19b30243d7
Import translations. DO NOT MERGE
...
Change-Id: I8023e0ca7bd730ba92a8a73fef2fd0c4ec339cd3
2012-04-30 14:25:47 -07:00