summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-08-22Merge "Disable MagicSmoke as it depends on hidden APIs."android-l-preview_r2l-previewStephen Hines
2014-08-22Merge "Import translations. DO NOT MERGE"Baligh Uddin
2014-08-22Disable MagicSmoke as it depends on hidden APIs.Stephen Hines
Bug: 16031597 RS graphics requires apps to be compiled against v20 or earlier. Building against internal APIs doesn't allow us to specify LOCAL_SDK_VERSION := 20 or any other valid value. Change-Id: I6803de8d7022aee65a2c41dc9005740f34581d9d (cherry picked from commit 7aa068093e814d7a53daa4850dbe5f5c3c16e262)
2014-08-21am e22d6a23: am 9d8a78c5: am 260be3ac: Merge "Disable MagicSmoke as it ↵Stephen Hines
depends on hidden APIs." into lmp-dev * commit 'e22d6a23e9b0f1374ad42118e5f5b2360d891c0f': Disable MagicSmoke as it depends on hidden APIs.
2014-08-21am 9d8a78c5: am 260be3ac: Merge "Disable MagicSmoke as it depends on hidden ↵Stephen Hines
APIs." into lmp-dev * commit '9d8a78c52d230189d24783a83a0924c77506cc81': Disable MagicSmoke as it depends on hidden APIs.
2014-08-21am 260be3ac: Merge "Disable MagicSmoke as it depends on hidden APIs." into ↵Stephen Hines
lmp-dev * commit '260be3ac529568cd44060427839061fb2237d061': Disable MagicSmoke as it depends on hidden APIs.
2014-08-21Merge "Disable MagicSmoke as it depends on hidden APIs." into lmp-devStephen Hines
2014-08-20Disable MagicSmoke as it depends on hidden APIs.Stephen Hines
Bug: 16031597 RS graphics requires apps to be compiled against v20 or earlier. Building against internal APIs doesn't allow us to specify LOCAL_SDK_VERSION := 20 or any other valid value. Change-Id: I6803de8d7022aee65a2c41dc9005740f34581d9d
2014-08-18Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Ib18ebe3e83b7312ad556755944ee5e1727b1cabf Auto-generated-cl: translation import
2014-08-17am b7eb4cb9: (-s ours) am 75d9b0bc: (-s ours) am be5c6575: (-s ours) Merge ↵Baligh Uddin
"Import translations. DO NOT MERGE" into lmp-dev * commit 'b7eb4cb9c51115e2b23c06c6a7418f43114a56de': Import translations. DO NOT MERGE
2014-08-17am 75d9b0bc: (-s ours) am be5c6575: (-s ours) Merge "Import translations. DO ↵Baligh Uddin
NOT MERGE" into lmp-dev * commit '75d9b0bca11153a338464f026a979be54a8b1106': Import translations. DO NOT MERGE
2014-08-17am be5c6575: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin
* commit 'be5c6575f3be61495e094997bf0dbefc2dd72144': Import translations. DO NOT MERGE
2014-08-16am 6eb90003: (-s ours) am c315ac51: (-s ours) am 297a8917: (-s ours) am ↵Baligh Uddin
88891cc3: (-s ours) am 8af24759: (-s ours) Import translations. DO NOT MERGE * commit '6eb90003146a603972dc2fc3155b9abd9fb7a8c9': Import translations. DO NOT MERGE
2014-08-16am c315ac51: (-s ours) am 297a8917: (-s ours) am 88891cc3: (-s ours) am ↵Baligh Uddin
8af24759: (-s ours) Import translations. DO NOT MERGE * commit 'c315ac511b6172c7c8c8dee014cbe583668b1d08': Import translations. DO NOT MERGE
2014-08-16am 297a8917: (-s ours) am 88891cc3: (-s ours) am 8af24759: (-s ours) Import ↵Baligh Uddin
translations. DO NOT MERGE * commit '297a89173d772ac7bb671cb32dca3278ccb66103': Import translations. DO NOT MERGE
2014-08-16am 88891cc3: (-s ours) am 8af24759: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '88891cc33add62175c597f0e03c024ca96678466': Import translations. DO NOT MERGE
2014-08-16Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin
2014-08-16Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I600ca4cbf9e7ece8149d8a8bc678a2c2e1918fbe Auto-generated-cl: translation import
2014-08-15am 8af24759: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '8af247596eace4e4ccbec300b751f8b59f4f9fe5': Import translations. DO NOT MERGE
2014-08-15Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Icf5699845d1bb2f42ffd638397ec26e3e3154993 Auto-generated-cl: translation import
2014-08-11Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Ic75f2affa5b075ef744b46c198c9d3a1d75535c9 Auto-generated-cl: translation import
2014-07-30Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I43da607819a39f0bb655021417a8cd93a943977d Auto-generated-cl: translation import
2014-07-22Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Ide91f8d41b9f09a504bee2fc2edd9a49ec90b3b3 Auto-generated-cl: translation import
2014-07-21am 844f88f2: (-s ours) am 94d273eb: am 85b3c772: Merge "Remove deprecated ↵Baligh Uddin
locales - DO NOT MERGE" into lmp-dev * commit '844f88f2d961ef41aba0d5250a2e1795120f4e12': Remove deprecated locales - DO NOT MERGE
2014-07-21am 39fd2902: (-s ours) am e463bffa: (-s ours) am 78b82219: (-s ours) Import ↵Baligh Uddin
translations. DO NOT MERGE * commit '39fd290224ab5f98ae1c0ebfc042b25a9f5e8ef9': Import translations. DO NOT MERGE
2014-07-20am 94d273eb: am 85b3c772: Merge "Remove deprecated locales - DO NOT MERGE" ↵Baligh Uddin
into lmp-dev * commit '94d273eb9c281cde17c2ad4c0648f9a0d219b161': Remove deprecated locales - DO NOT MERGE
2014-07-20am e463bffa: (-s ours) am 78b82219: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit 'e463bffa5803d9fbe60166164946b1827e7c34ab': Import translations. DO NOT MERGE
2014-07-20am 85b3c772: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-devBaligh Uddin
* commit '85b3c7729234afc4f2199abee2b3c4f58bd80761': Remove deprecated locales - DO NOT MERGE
2014-07-19am 78b82219: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '78b82219ffd013c38d8c8c6c470abcbb814c452b': Import translations. DO NOT MERGE
2014-07-18Remove deprecated localesBaligh Uddin
Change-Id: Ie503fb47a964292067065d4b35fdb16a77eeb67e
2014-07-17Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Id8778dadf9ceb242bd6d4095a9cae9c98a893b58 Auto-generated-cl: translation import
2014-07-17Remove deprecated localesBaligh Uddin
Change-Id: I411e302045feec6b525670ccd4e00392de18a599
2014-07-17Merge "Remove deprecated locales - DO NOT MERGE" into lmp-devBaligh Uddin
2014-07-19Remove deprecated locales - DO NOT MERGEBaligh Uddin
Change-Id: I4d9e7d2d2fcf95b3a5ed9b102d1a5ca04eabb6bc
2014-07-06am 8b02fa4b: (-s ours) am 94b8f947: (-s ours) am 55cf3f55: (-s ours) am ↵Baligh Uddin
729da486: (-s ours) Import translations. DO NOT MERGE * commit '8b02fa4b48ca700d7c56b40fb236413224a5586a': Import translations. DO NOT MERGE
2014-07-06am 94b8f947: (-s ours) am 55cf3f55: (-s ours) am 729da486: (-s ours) Import ↵Baligh Uddin
translations. DO NOT MERGE * commit '94b8f947e66f0602fed5ee38e80c50e40713c698': Import translations. DO NOT MERGE
2014-07-06am 55cf3f55: (-s ours) am 729da486: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '55cf3f5533bdfdb5273c8fd7a1b3d27cddb642d8': Import translations. DO NOT MERGE
2014-07-06am ff5c524a: (-s ours) am 13949955: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit 'ff5c524aabcd412b22143c50f2669ac590c38fde': Import translations. DO NOT MERGE
2014-07-06am 729da486: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '729da4867dcb7e21e7187e088d410caf84b90384': Import translations. DO NOT MERGE
2014-07-06am 13949955: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '139499559b02b675f46a3c9e9534192bcd5fd853': Import translations. DO NOT MERGE
2014-07-06Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I2bd445eb1dec98ae91210588a099f04068867b3c Auto-generated-cl: translation import
2014-07-06Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I1dff201fb4f9fa715e57e32432deaafb11bba561 Auto-generated-cl: translation import
2014-07-06Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I8d6946556cb8741c02d2e2e7a4ee1bcfe86e499a Auto-generated-cl: translation import
2014-06-30Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I8981678977faa562567e1f37b88d72c1ad4911b3 Auto-generated-cl: translation import
2014-06-26am 55b41309: (-s ours) am 4c390183: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '55b4130918869bcd1a955a5a4438e19a4ca91840': Import translations. DO NOT MERGE
2014-06-26am 4c390183: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '4c3901835fed371205718b77f57bf3e577a5a26b': Import translations. DO NOT MERGE
2014-06-25Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Ib7ca219e20d5e828ec953581b9dcf7ca4b82a3a2 Auto-generated-cl: translation import
2014-06-23Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Id60032151ea9cc27d3ecc1800be63e93bca21e8e Auto-generated-cl: translation import
2014-06-18Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I976d276604ace8d36b3ae41883c9aee3c996bb0f Auto-generated-cl: translation import
2014-06-09Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I67fbe63721d648d981d9990180f452cb5c3954b0 Auto-generated-cl: translation import