OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change...
Deepanshu Gupta [Tue, 8 Jul 2014 23:41:59 +0000 (23:41 +0000)]
am 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '00a1033408407bce5997e81165ffea35844786a1':
  Change font family name. [DO NOT MERGE]

10 years agoam 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family...
Deepanshu Gupta [Tue, 8 Jul 2014 23:36:50 +0000 (23:36 +0000)]
am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '931e049e6566723027554e57905de109b6faa783':
  Change font family name. [DO NOT MERGE]

10 years agoam efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a...
Deepanshu Gupta [Tue, 8 Jul 2014 23:34:08 +0000 (23:34 +0000)]
am efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'efa0e90cc581a9bbef9ae15ce8f1b6780c1c4bfe':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT...
Deepanshu Gupta [Tue, 8 Jul 2014 23:32:12 +0000 (23:32 +0000)]
am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '5414f83d38455fcd8c788ea1b5cf61aaef3d0a5d':
  Change font family name. [DO NOT MERGE]

10 years agoam 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:29:03 +0000 (23:29 +0000)]
am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]

* commit '8c8bb83e623e1932853230cb25a3330fcedb73ff':
  Change font family name. [DO NOT MERGE]

10 years agoam e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename...
Deepanshu Gupta [Tue, 8 Jul 2014 23:28:41 +0000 (23:28 +0000)]
am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'e63b7ad391effb405712647f761402ce15d0ea48':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:28:32 +0000 (23:28 +0000)]
am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit 'd2829b490989b595118c7bd17c1dbff6789cacaa':
  Change font family name. [DO NOT MERGE]

10 years agoam 432d16f9: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:17 +0000 (23:24 +0000)]
am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '432d16f97adab9d845904e25b50671cf35cfb628':
  Change font family name. [DO NOT MERGE]

10 years agoam 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for...
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:15 +0000 (23:24 +0000)]
am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit '5acf782c6822bf6c1b24d3582f52d65a949912f6':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 8e11659a: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:05 +0000 (23:24 +0000)]
am 8e11659a: Change font family name. [DO NOT MERGE]

* commit '8e11659a43b34d465deb631575425b1706547dcc':
  Change font family name. [DO NOT MERGE]

10 years agoam d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:19:46 +0000 (23:19 +0000)]
am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'd751eed44bcb28461dc853df08b89e5bc8ab6f60':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:15:39 +0000 (23:15 +0000)]
am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'b49e21e153c59b31503a376d62257e4fc6e7ce4f':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoChange font family name. [DO NOT MERGE]
Deepanshu Gupta [Sat, 28 Jun 2014 01:39:32 +0000 (18:39 -0700)]
Change font family name. [DO NOT MERGE]

During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)

10 years agoMerge "docs: Release notes for support lib v20" into klp-modular-dev
Ricardo Cervera [Tue, 8 Jul 2014 17:34:14 +0000 (17:34 +0000)]
Merge "docs: Release notes for support lib v20" into klp-modular-dev

10 years agodocs: Release notes for support lib v20
Ricardo Cervera [Mon, 7 Jul 2014 20:15:56 +0000 (13:15 -0700)]
docs: Release notes for support lib v20

Change-Id: I82bbad9ad8945e9437b790e0f47622ef00b318f1

10 years agodocs: Fixed angle bracket typo for task locking command line instructions.
Quddus Chong [Tue, 8 Jul 2014 17:07:43 +0000 (10:07 -0700)]
docs: Fixed angle bracket typo for task locking command line instructions.
bug: 16153312

Change-Id: If552028d36878398fe6fd999e711dff321fa9f13

10 years agoChange font family name. [DO NOT MERGE]
Deepanshu Gupta [Sat, 28 Jun 2014 01:39:32 +0000 (18:39 -0700)]
Change font family name. [DO NOT MERGE]

During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)

10 years agoDoc Update: Add Cloud Save to left nav.
kmccormick [Mon, 7 Jul 2014 21:18:30 +0000 (14:18 -0700)]
Doc Update: Add Cloud Save to left nav.

Change-Id: Id87b0ea16231bc70cbd8147ec5252aad251f2363

10 years agoMerge "docs: Minor fix in the Building Your Project with Gradle guide" into klp-modul...
Ricardo Cervera [Mon, 7 Jul 2014 21:05:53 +0000 (21:05 +0000)]
Merge "docs: Minor fix in the Building Your Project with Gradle guide" into klp-modular-dev

10 years agodocs: Minor fix in the Building Your Project with Gradle guide
Ricardo Cervera [Mon, 7 Jul 2014 17:24:47 +0000 (10:24 -0700)]
docs: Minor fix in the Building Your Project with Gradle guide

Change-Id: Ibcb27f4f7cade4a69babd08d7273440a4554e79f

10 years agoam 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 19:42:25 +0000 (19:42 +0000)]
am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '59db17673d9d2a5be386e9f324f8f2a7b455d0b1':
  Import translations. DO NOT MERGE

10 years agoam 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 19:42:22 +0000 (19:42 +0000)]
am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '314bfe071011cc16d56a9c8bfb65000cd3597bf0':
  Import translations. DO NOT MERGE

10 years agoam 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:33:07 +0000 (18:33 +0000)]
am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '43ba3ba479e3779db4f260eae55ddbfbf3dc30d8':
  Import translations. DO NOT MERGE

10 years agoam 93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:33:04 +0000 (18:33 +0000)]
am 93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '93360f022ec67bb994f04f9799bfac32997f0d00':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 19:37:20 +0000 (19:37 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 16:20:43 +0000 (09:20 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4a6f893b2d7157b8d7d70cb41a5b9c75043342dc
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:30:19 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 16:27:47 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: I870d8d23d6d1923dcfa118d151e26bf9b7a8f86e
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:30:06 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 16:30:04 +0000 (09:30 -0700)]
Import translations. DO NOT MERGE

Change-Id: I99893089a51a6984d44db22628dccc90b0867faf
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:29:14 +0000 (18:29 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 16:35:17 +0000 (09:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: I511bc5ac04b62fe85c7306d506af686888a79957
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:22:35 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 16:44:21 +0000 (09:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I99d859070b0a2d65c9e57556f7ccc0b4dfb3a995
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:19:04 +0000 (18:19 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 17:45:00 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: I300f1b8bf139efb93c8a7c0d0f5ad8b77a4c2d42
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:18:46 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 21:00:41 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2898d53a3f6bf4fc920fa8c3bc122d00aa879d18
Auto-generated-cl: translation import

10 years agoMerge "docs: update device dashboard for july" into klp-modular-dev
Robert Ly [Mon, 7 Jul 2014 17:42:47 +0000 (17:42 +0000)]
Merge "docs: update device dashboard for july" into klp-modular-dev

10 years agodocs: update device dashboard for july
Robert Ly [Mon, 7 Jul 2014 14:55:18 +0000 (07:55 -0700)]
docs: update device dashboard for july

Change-Id: I31276f82d77f4b43dd458b3395b41ca7564f93c2

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 19:37:29 +0000 (19:37 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 16:13:21 +0000 (09:13 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie6b54296891316dc9a594ceafb8d95ba67b9dea0
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:28:46 +0000 (18:28 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoam b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:26:05 +0000 (18:26 +0000)]
am b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'b4600e793b4b8a4332031d08c5ba5290abe0c71d':
  Import translations. DO NOT MERGE

10 years agoam f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:26:01 +0000 (18:26 +0000)]
am f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'f599be53727976c495575e864e1566cfdaf2eee5':
  Import translations. DO NOT MERGE

10 years agoam f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:25:58 +0000 (18:25 +0000)]
am f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'f1c1e725ec44aab7ebc5c4530133b169ddb6f73e':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 16:37:11 +0000 (09:37 -0700)]
Import translations. DO NOT MERGE

Change-Id: If4b5accea11eca57ba5c42f35eef40aaf7010ccd
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:15:54 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 21:08:04 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic36073cb71d82e8bb36b3409185a0bfc9ddb0ecd
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:02:50 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 22:09:48 +0000 (15:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic88faf73641a8570560ffe751f0c5776290c75c3
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:00:38 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 22:40:58 +0000 (15:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7fc09c4e2f022c81a461d7228727ddc84ad6bb96
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 22:25:24 +0000 (15:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1765b9912ea2356677a927edb34166ea5cab43d9
Auto-generated-cl: translation import

10 years agoMerge "docs: fix links" into klp-modular-dev
Robert Ly [Mon, 7 Jul 2014 17:42:31 +0000 (17:42 +0000)]
Merge "docs: fix links" into klp-modular-dev

10 years agodocs: fix links
Robert Ly [Mon, 7 Jul 2014 15:28:00 +0000 (08:28 -0700)]
docs: fix links

Change-Id: Ib3cc9e4608ddbbcb0bdf91ec79cd22a01ae6566b

10 years agoMerge "Fix incorrect link in Android Wear documentation." into klp-modular-dev
Robert Ly [Sun, 6 Jul 2014 22:25:29 +0000 (22:25 +0000)]
Merge "Fix incorrect link in Android Wear documentation." into klp-modular-dev

10 years agoFix incorrect link in Android Wear documentation.
Flavio Lerda [Sun, 6 Jul 2014 21:56:39 +0000 (22:56 +0100)]
Fix incorrect link in Android Wear documentation.

The link name was misspelled and pointed to the wrong directory.

Change-Id: I471892349dbe3ebbe9ec425a2a78b172d2ec6a0f

10 years agoam 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 6 Jul 2014 19:45:38 +0000 (19:45 +0000)]
am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '02c355d10b3235b73d58ab54222721e32bec3f1f':
  Import translations. DO NOT MERGE

10 years agoam 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 6 Jul 2014 19:45:34 +0000 (19:45 +0000)]
am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '89523569e4c1be2e102b5fb991023d6696384d76':
  Import translations. DO NOT MERGE

10 years agoam 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 6 Jul 2014 18:39:28 +0000 (18:39 +0000)]
am 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8e1bf9f1a38b70459ddcaeb816b83c3c83e8c9b8':
  Import translations. DO NOT MERGE

10 years agoam 2ea222e6: (-s ours) am 93360f02: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 6 Jul 2014 18:39:24 +0000 (18:39 +0000)]
am 2ea222e6: (-s ours) am 93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2ea222e6615cef6977e40b0dbb7b58c2313e6976':
  Import translations. DO NOT MERGE

10 years agoam ab157d74: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:33:21 +0000 (18:33 +0000)]
am ab157d74: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit 'ab157d740ed5c0bff544adc8992d9fce99462707':
  Import translations. DO NOT MERGE

10 years agoam 87bcd150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:33:17 +0000 (18:33 +0000)]
am 87bcd150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '87bcd150a4122b78e98d3b859869b54e4546405d':
  Import translations. DO NOT MERGE

10 years agoam f643d529: (-s ours) am b4600e79: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 6 Jul 2014 18:33:12 +0000 (18:33 +0000)]
am f643d529: (-s ours) am b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'f643d52941be004e14b7edfe3035996475f95028':
  Import translations. DO NOT MERGE

10 years agoam 2f689434: (-s ours) am f599be53: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 6 Jul 2014 18:33:08 +0000 (18:33 +0000)]
am 2f689434: (-s ours) am f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2f6894345691af96d23952146bc3495758f84fbb':
  Import translations. DO NOT MERGE

10 years agoam 6e90b3c0: (-s ours) am f1c1e725: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 6 Jul 2014 18:33:04 +0000 (18:33 +0000)]
am 6e90b3c0: (-s ours) am f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '6e90b3c078baa2b6c6398376490b7c540309be70':
  Import translations. DO NOT MERGE

10 years agoam 51ad6520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:29:03 +0000 (18:29 +0000)]
am 51ad6520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '51ad6520b6d7870dc26d20139cc3a934dfb994f6':
  Import translations. DO NOT MERGE

10 years agoam 6b7d2cf7: (-s ours) am f67d4baf: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 6 Jul 2014 18:28:54 +0000 (18:28 +0000)]
am 6b7d2cf7: (-s ours) am f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '6b7d2cf77d28922a8e81730e2a462aab258dfe68':
  Import translations. DO NOT MERGE

10 years agoam 6df13287: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:28:50 +0000 (18:28 +0000)]
am 6df13287: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '6df132872faa605304ab9dc488cc589580742a28':
  Import translations. DO NOT MERGE

10 years agoam 334c84cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:28:47 +0000 (18:28 +0000)]
am 334c84cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '334c84cfe60cd938317d0a3ee1a47c5cc8331077':
  Import translations. DO NOT MERGE

10 years agoam f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:21:51 +0000 (18:21 +0000)]
am f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'f67d4bafee9ab60912add98ad4ec0697d3e231fc':
  Import translations. DO NOT MERGE

10 years agoam add3fb66: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:21:15 +0000 (18:21 +0000)]
am add3fb66: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit 'add3fb664a7e245caf86facc1855d8b9ce4281be':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:15:48 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoam f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:08:28 +0000 (18:08 +0000)]
am f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'f2e29071079ab67d6ed66852f6a6f5d4f1ee8753':
  Import translations. DO NOT MERGE

10 years agoMerge branch 'klp-ub-dev' of https://googleplex-android.googlesource.com/_direct...
Baligh Uddin [Sun, 6 Jul 2014 18:08:27 +0000 (18:08 +0000)]
Merge branch 'klp-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev

10 years agoam eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Jul 2014 18:08:20 +0000 (18:08 +0000)]
am eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'eb17f6ab69ce9dda043c17827351522a8bcc2613':
  Import translations. DO NOT MERGE

10 years agoam 77c61120: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:17 +0000 (18:08 +0000)]
am 77c61120: (-s ours) Import translations. DO NOT MERGE

* commit '77c6112089e3fb58189b69f56f14b55a94c6b0da':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 21:10:06 +0000 (14:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie1868681bbc06d89a0695863e9146cd2ee85a5de
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Sun, 6 Jul 2014 18:19:01 +0000 (18:19 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoam fd5e4617: (-s ours) am f2e29071: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 6 Jul 2014 18:13:04 +0000 (18:13 +0000)]
am fd5e4617: (-s ours) am f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'fd5e46171db33fc2f5dcb6fbfbb6b19e36e9b485':
  Import translations. DO NOT MERGE

10 years agoam 026d5d21: Merge branch \'klp-ub-dev\' of https://googleplex-android.googlesource...
Baligh Uddin [Sun, 6 Jul 2014 18:12:41 +0000 (18:12 +0000)]
am 026d5d21: Merge branch \'klp-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev

* commit '026d5d21e1de6ba1a085059bb9a6c959690dc994':
  Import translations. DO NOT MERGE

10 years agoam e885a9ca: (-s ours) am eb17f6ab: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 6 Jul 2014 18:12:38 +0000 (18:12 +0000)]
am e885a9ca: (-s ours) am eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'e885a9ca9b54aec74dc78de1fab0f2efeb910046':
  Import translations. DO NOT MERGE

10 years agoam 57a85cee: (-s ours) am 77c61120: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:12:35 +0000 (18:12 +0000)]
am 57a85cee: (-s ours) am 77c61120: (-s ours) Import translations. DO NOT MERGE

* commit '57a85ceed620a2c13dfddfbe702a1baee0076343':
  Import translations. DO NOT MERGE

10 years agoam b84a800c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:08:20 +0000 (18:08 +0000)]
am b84a800c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit 'b84a800c173d6f6690568b59be0708c8dcb9fb4d':
  Import translations. DO NOT MERGE

10 years agoam 562d8cc7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:08:16 +0000 (18:08 +0000)]
am 562d8cc7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '562d8cc7bc203a03ed20f1dbf25ef5f3f80c4705':
  Import translations. DO NOT MERGE

10 years agoam f617f4d0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:13 +0000 (18:08 +0000)]
am f617f4d0: (-s ours) Import translations. DO NOT MERGE

* commit 'f617f4d074886949f48e0f1c507f76d917a7f2b2':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 22:42:53 +0000 (15:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia07b3b246f397eda9216449403dd283e02f69c42
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 22:10:35 +0000 (15:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: I75c29be2b22f6cf19a373c4be07f7a8410a14cb1
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 18:08:40 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3e2eae5b30231f3dc719c231d51c35234ed9dd94
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:00:33 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 22:30:27 +0000 (15:30 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1fd2ea26acb4d0e1c46c887c94d25e0ea1407e81
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:22:30 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 16:49:29 +0000 (09:49 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5577bfec3d18dd6a399f8ad5e0b520e992eac1e5
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:18:57 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 18:54:26 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4679d0c0cec6404efadee93753f5877d4d0d1db6
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:18:40 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 21:03:04 +0000 (14:03 -0700)]
Import translations. DO NOT MERGE

Change-Id: I373c01ed35b98a24791ab2fdfa57e019b8e705ba
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:08:17 +0000 (18:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 22:18:31 +0000 (15:18 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic92e03292351a4163522907fd285ad41d4877039
Auto-generated-cl: translation import