summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Import translations. DO NOT MERGEGeoff Mendal2013-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic73ad55d97dbba28f4d4cbc74fd3076b91409e8b Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-11-010-0/+0
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-303-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie88022677fac6f133d92847f3c34dd6c5a0cd1e6 Auto-generated-cl: translation import
* | | | | am bea392cb: (-s ours) am 9f18f6a7: (-s ours) am 9824f21d: (-s ours) Import ↵Baligh Uddin2013-11-010-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'bea392cb1bd057826cc30b9124d045ad0cb41f6d': Import translations. DO NOT MERGE
| * | | | am 9f18f6a7: (-s ours) am 9824f21d: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-010-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '9f18f6a7c0e8b8351c9f12f5c6c23bfc37d911d5': Import translations. DO NOT MERGE
| | * | | am 9824f21d: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-010-0/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '9824f21d1fc306d6c4df7b846ee6b64e0692267b': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEBaligh Uddin2013-10-283-3/+3
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I091fcb16570e99040da8fcfdb187463f08bc7271 Auto-generated-cl: translation import
* | | / Import translations. DO NOT MERGEBaligh Uddin2013-10-283-3/+3
| |_|/ |/| | | | | | | | | | | Change-Id: I92afef8fa809e6f72916faaebd2fda3176b1b998 Auto-generated-cl: translation import
* | | am d8e1221d: (-s ours) am a041ad47: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-09-140-0/+0
|\| | | | | | | | | | | | | | * commit 'd8e1221d167b2086f71b807332ea558efe83d867': Import translations. DO NOT MERGE
| * | am a041ad47: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-09-140-0/+0
| |\| | | | | | | | | | | | | * commit 'a041ad47c2f69d2a5439cc84b407d8aada3ed731': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEBaligh Uddin2013-09-1410-0/+310
| |/ | | | | | | | | Change-Id: I7e6c5ae0b1717235c30a1b9d6971beb900dcbde5 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-08-292-0/+62
| | | | | | | | | | Change-Id: I1f1bae5185f4aa4d8187de7d623720a03e74fd8b Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-08-268-0/+248
| | | | | | | | | | Change-Id: I1d6ac566b687ddfd4160c47271ee551eb7ecdd9d Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-08-1911-0/+341
|/ | | | | Change-Id: Ibff4f1a04e51f78c1a12c35b1525893e3daa13d6 Auto-generated-cl: translation import
* am cd4e5167: am 5edf43bd: Merge "Switch Tag over to the public ↵Elliott Hughes2013-07-011-4/+4
|\ | | | | | | | | | | | | StandardCharsets." * commit 'cd4e51672087d3accc5eb0b6effa22f8d88d3acf': Switch Tag over to the public StandardCharsets.
| * am 5edf43bd: Merge "Switch Tag over to the public StandardCharsets."Elliott Hughes2013-07-011-4/+4
| |\ | | | | | | | | | | | | * commit '5edf43bdfdfc677523e1577df8cce2750a58ae0e': Switch Tag over to the public StandardCharsets.
| | * Merge "Switch Tag over to the public StandardCharsets."Elliott Hughes2013-07-011-4/+4
| | |\
| | | * Switch Tag over to the public StandardCharsets.Elliott Hughes2013-06-281-4/+4
| | |/ | | | | | | | | | Change-Id: If0f112014c64e1986f57bab537f1767c6e3cc674
* | | Tag needs to be privilegedChristopher Tate2013-06-181-1/+2
| | | | | | | | | | | | | | | | | | ... in order to write secure settings. Change-Id: Ia2b40383fd7a338fefe5134bf0c91335d490add3
* | | Import translations. DO NOT MERGEBaligh Uddin2013-05-081-1/+1
| | | | | | | | | | | | | | | Change-Id: I5403bffb26b022df14413b63331cbaddd7bfd206 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2013-03-181-1/+1
| | | | | | | | | | | | | | | Change-Id: Iedd73b070dc187af9198a7a9e9ac1d4f7c43925d Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2013-02-271-1/+1
|/ / | | | | | | | | Change-Id: Ied23aaa6ba68a7218b79334a62b3f82e471eb50c Auto-generated-cl: translation import
* / Import translations. DO NOT MERGEBaligh Uddin2013-02-151-1/+1
|/ | | | | Change-Id: I253b933dea023b4063bb9abb517d77a911ac4fc1 Auto-generated-cl: translation import
* Fix Tags app NPE.cm-10.1-M2cm-10.1-M1mr1.1-stagingMartijn Coenen2012-09-061-0/+3
| | | | | | mimeType parser can return null on some types. Change-Id: I8bd8d9674686bcbdec47410d5f6700c6483a53db
* Import translations. DO NOT MERGEYing Wang2012-07-201-1/+1
| | | | | Change-Id: I2c94aec4da41c883d3c0c2d24db4dc2e36d7e408 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEYing Wang2012-07-161-1/+1
| | | | | Change-Id: If7251af0e3dc7a135f6e5dbd55f97b04193525b4 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEYing Wang2012-07-131-1/+1
| | | | | Change-Id: I15c443c5769d7e5f7b2a4fcdcd2f50b7328fdec1 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEEric Fischer2012-05-251-1/+1
| | | | Change-Id: I8f5aa4fe5d9a63c443268364e600648acaef8a2f
* Import translations. DO NOT MERGEEric Fischer2012-05-021-1/+1
| | | | Change-Id: I60287b9deaa0aca1f3b8b3126744c9fbcaf05976
* Merge remote-tracking branch 'goog/ics-aah'jellybean-stablejellybeanMike Lockwood2012-04-030-0/+0
|\
| * am 5c34e64a: Import revised translations. DO NOT MERGEEric Fischer2011-11-161-1/+1
| |\ | | | | | | | | | | | | * commit '5c34e64a6083adeb6ad2355ce6d900a401b5938e': Import revised translations. DO NOT MERGE
| * \ am 3fad71bd: Import revised translations.Eric Fischer2011-11-012-0/+62
| |\ \ | | | | | | | | | | | | | | | | * commit '3fad71bd8426293efe8974eab77aaae107ebca97': Import revised translations.
| * \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \
| | * \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \
| | | * | | reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |/| | | | |/|/ / /
| | * | | am 53f654f3: Merge "Import revised translations."Eric Fischer2011-10-181-0/+31
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '53f654f3948f5d7bc248a0e6e0457e9ee367364a': Import revised translations.
| | * | | am ef6f240c: (-s ours) am 7c74ecc6: (-s ours) Import revised translations. ↵Eric Fischer2011-10-180-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit 'ef6f240c6655cb05509ba79efc9265840cdd065d': Import revised translations. DO NOT MERGE
* | | | | | Some quick cleanup of Tag.apk using new NDEF APIsNick Pelly2012-01-197-143/+17
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib3825f7abb27f7552ad0c0a93ce5ceb3af18d262
* | | | | | Import revised translations.Eric Fischer2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I15ef8fbf29df4de7d5ec8bc951536d5010cea11d
* | | | | | am 5c34e64a: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-170-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * commit '5c34e64a6083adeb6ad2355ce6d900a401b5938e': Import revised translations. DO NOT MERGE
| * | | | | Import revised translations. DO NOT MERGEics-releaseicscm-9.1.0Eric Fischer2011-11-161-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: Ib9491ac947a164a0690580435c4395a63c011985
* | | | | Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Import revised translations.Eric Fischer2011-11-022-0/+62
| |/ / / | | | | | | | | | | | | Change-Id: I803c05e912c7b787d680ee776e5d32a778bdb27f
* / / / Import revised translations.Eric Fischer2011-11-012-0/+62
|/ / / | | | | | | | | | Change-Id: I103bf135f7a4bec76eaf7f81145df43af4c52b92
* | | Merge "Import revised translations."Eric Fischer2011-10-181-0/+31
|\ \ \ | |_|/ |/| |
| * | Import revised translations.Eric Fischer2011-10-181-0/+31
| |/ | | | | | | Change-Id: Ib1fc23cb26fb3a4d95fcd65f53d4820e8eba3786
* | am 7c74ecc6: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-180-0/+0
|\ \ | |/ |/| | | | | * commit '7c74ecc6b316172221ca52ab770068b746f794fb': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-181-0/+31
|/ | | | Change-Id: I2d80de5ad040f62ffce4653047f3293701753cc3
* Import revised translations.Eric Fischer2011-08-221-3/+3
| | | | Change-Id: I84ac53b1ba9f54cdbfe03a67d29de78ab977294e
* Update the Tags app to the holo theme and fix some bugs.Jeff Hamilton2011-07-273-72/+30
| | | | Change-Id: I217cf3f5b2e228df50ff1bed050448bf72140a3b