platform_packages_apps_Protips, branch jb-dev Unnamed repository; edit this file 'description' to name the repository. Merge remote-tracking branch 'goog/ics-aah' 2012-04-03T17:54:18+00:00 Mike Lockwood lockwood@google.com 2012-04-03T17:54:18+00:00 1523bc37f4a30f890d2c17afc604ff364132ebab 






Revert "Armor magic text in placeholders so it can't get damaged in translation."
2012-03-28T16:49:17+00:00

Eric Fischer
enf@google.com

2012-03-28T16:49:17+00:00

4ebf69aa9328e288dfa17518bf782ef99209e189

This reverts commit f9c5893a9abdc6de8b5e7a6b2160be033c88362a.





This reverts commit f9c5893a9abdc6de8b5e7a6b2160be033c88362a.







Merge "Armor magic text in placeholders so it can't get damaged in translation."
2012-03-28T16:16:29+00:00

Eric Fischer
enf@google.com

2012-03-28T16:16:29+00:00

bbeabed9dcb88af99d791e45769f26748faf2290












Armor magic text in placeholders so it can't get damaged in translation.
2012-03-23T21:30:26+00:00

Eric Fischer
enf@google.com

2012-03-23T21:30:26+00:00

f9c5893a9abdc6de8b5e7a6b2160be033c88362a

Change-Id: I11a2f305565077cd95955ce301a0dba027ca2ed3





Change-Id: I11a2f305565077cd95955ce301a0dba027ca2ed3







Import translations. DO NOT MERGE
2012-03-23T20:15:20+00:00

Eric Fischer
enf@google.com

2012-03-23T20:15:20+00:00

99a56cb36dabe758e556362aefa92039dd5f3ed2

Change-Id: Ic2718be1b8e37fd0862a611793215c43f3590e19





Change-Id: Ic2718be1b8e37fd0862a611793215c43f3590e19







Import revised translations.
2011-11-29T19:16:54+00:00

Eric Fischer
enf@google.com

2011-11-29T19:16:54+00:00

e3d1a6393efe7ba4e7dadb3fb91eff4f39e64ff0

Change-Id: I2c3d5e65c3137b40fb315a77a60fdbc39caac76b





Change-Id: I2c3d5e65c3137b40fb315a77a60fdbc39caac76b







am 635bfe91: (-s ours) Import revised translations. DO NOT MERGE
2011-11-22T05:08:08+00:00

Eric Fischer
enf@google.com

2011-11-22T05:08:08+00:00

8144105c304fee096825e3d8eaa3c1f0b9a5543e

* commit '635bfe91eb8cb158a193bd8987a29d8b72f227b9':
  Import revised translations. DO NOT MERGE





* commit '635bfe91eb8cb158a193bd8987a29d8b72f227b9':
  Import revised translations. DO NOT MERGE







am 635bfe91: Import revised translations. DO NOT MERGE
2011-11-21T23:27:08+00:00

Eric Fischer
enf@google.com

2011-11-21T23:27:08+00:00

c5de0128fc4757a61ffaa257ee4293fdbaa16e86

* commit '635bfe91eb8cb158a193bd8987a29d8b72f227b9':
  Import revised translations. DO NOT MERGE





* commit '635bfe91eb8cb158a193bd8987a29d8b72f227b9':
  Import revised translations. DO NOT MERGE







Import revised translations. DO NOT MERGE
2011-11-21T23:02:05+00:00

Eric Fischer
enf@google.com

2011-11-21T23:02:05+00:00

635bfe91eb8cb158a193bd8987a29d8b72f227b9

Change-Id: Ieadf84a79ac7a2ab770ce9e2eda56ec5c12a80db





Change-Id: Ieadf84a79ac7a2ab770ce9e2eda56ec5c12a80db







am 72ee4b3d: (-s ours) Import revised translations.  DO NOT MERGE
2011-11-17T13:45:41+00:00

Eric Fischer
enf@google.com

2011-11-17T13:45:41+00:00

adabb1537824b61b312db437a40e1d2271f03b8f

* commit '72ee4b3d95931f44643e1c6e2a79c413014be6da':
  Import revised translations.  DO NOT MERGE





* commit '72ee4b3d95931f44643e1c6e2a79c413014be6da':
  Import revised translations.  DO NOT MERGE