OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours...
Deepanshu Gupta [Tue, 8 Jul 2014 23:50:09 +0000 (23:50 +0000)]
am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

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

10 years agoam 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92...
Deepanshu Gupta [Tue, 8 Jul 2014 23:45:05 +0000 (23:45 +0000)]
am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

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

10 years agoam b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc...
Deepanshu Gupta [Tue, 8 Jul 2014 23:39:43 +0000 (23:39 +0000)]
am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'b0470a1fce9e496b4812e8d652db20b8af656c02':
  Add a script to rename fonts for SDK. [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 d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge...
Deepanshu Gupta [Tue, 8 Jul 2014 23:35:09 +0000 (23:35 +0000)]
am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'd7ce84528da16ef53eb8e3c9f34a5c7ca90fd1b3':
  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 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script...
Deepanshu Gupta [Tue, 8 Jul 2014 23:30:10 +0000 (23:30 +0000)]
am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '10e540733416a94206a656ce749fa046ab3e7655':
  Add a script to rename fonts for SDK. [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 ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK...
Deepanshu Gupta [Tue, 8 Jul 2014 23:26:15 +0000 (23:26 +0000)]
am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'ca82da92db2949f134af01f577167639cbfc79bc':
  Add a script to rename fonts for SDK. [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 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE...
Deepanshu Gupta [Tue, 8 Jul 2014 23:21:34 +0000 (23:21 +0000)]
am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '5d0db7f2ff4a16a40bbdba9b1ae9b4434554bced':
  Add a script to rename fonts for SDK. [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 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb...
Deepanshu Gupta [Tue, 8 Jul 2014 23:17:22 +0000 (23:17 +0000)]
am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '5455ddc48fc31faea739a21cb46bda04bf36bb92':
  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 "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev
Deepanshu Gupta [Tue, 8 Jul 2014 23:13:32 +0000 (23:13 +0000)]
Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

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 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 "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 "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 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 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: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-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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:02:45 +0000 (18:02 +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:12:04 +0000 (15:12 -0700)]
Import translations. DO NOT MERGE

Change-Id: I986812a228a7207cb203a4c0862d96dbd0f1e868
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: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:30:27 +0000 (15:30 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing...
Joe Fernandez [Wed, 25 Jun 2014 22:49:36 +0000 (22:49 +0000)]
am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs

* commit '52e2416cc72f7d87e2f7f1aa29b7a9cb85ae0c70':
  docs: fix wear whitelist sign up language to be less confusing

10 years agoam 12df4f9e: update wear icons on preview page
smain@google.com [Wed, 25 Jun 2014 18:14:11 +0000 (18:14 +0000)]
am 12df4f9e: update wear icons on preview page

* commit '12df4f9ef19b49147f700cfa95fb73517540b033':
  update wear icons on preview page

10 years agoupdate wear icons on preview page
smain@google.com [Wed, 25 Jun 2014 18:07:05 +0000 (11:07 -0700)]
update wear icons on preview page

Change-Id: I17fc5a7d1ba637ea0eb557eae50aea76667e2430

10 years agoam 2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs
Robert Ly [Wed, 25 Jun 2014 04:01:53 +0000 (04:01 +0000)]
am 2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs

* commit '2a139d648602e6812e5366ec1abc29fa2b010c99':
  docs: add gms core preview hoop-jumping

10 years agoMerge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
Joe Fernandez [Wed, 25 Jun 2014 22:45:23 +0000 (22:45 +0000)]
Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs

10 years agodocs: fix wear whitelist sign up language to be less confusing
Joe Fernandez [Wed, 25 Jun 2014 22:40:48 +0000 (15:40 -0700)]
docs: fix wear whitelist sign up language to be less confusing

Change-Id: I15fcad2db2df6f8f2717e486e306246de3f96f4b

10 years agoMerge "docs: add gms core preview hoop-jumping" into klp-docs
Robert Ly [Wed, 25 Jun 2014 03:57:34 +0000 (03:57 +0000)]
Merge "docs: add gms core preview hoop-jumping" into klp-docs

10 years agoam ec6f162f: DO NOT MERGE!
smain@google.com [Wed, 25 Jun 2014 02:06:47 +0000 (02:06 +0000)]
am ec6f162f: DO NOT MERGE!

* commit 'ec6f162f0e3fc0d68c1ec0ac30ff1353bf4f1e97':
  DO NOT MERGE!

10 years agoam 53126416: DO NOT MERGE!
smain@google.com [Wed, 25 Jun 2014 02:06:43 +0000 (02:06 +0000)]
am 53126416: DO NOT MERGE!

* commit '531264164a2cd24fa412b71782ef424a2d968028':
  DO NOT MERGE!

10 years agoDO NOT MERGE!
smain@google.com [Tue, 24 Jun 2014 19:35:31 +0000 (12:35 -0700)]
DO NOT MERGE!

add image to GP education collection card

Change-Id: Ie21813f84277ee8f882efc1a8589080476a4bf66
(cherry picked from commit f4787f4dce96bef3de95d36ce400691c72df3d7e)

10 years agoDO NOT MERGE!
smain@google.com [Wed, 18 Jun 2014 23:13:56 +0000 (16:13 -0700)]
DO NOT MERGE!

update Edu pages for launch of Chrome edu apps on play store
removes the FAQ and Guidelines docs, redirect to devsite copy will
be implemented with separate CL

Change-Id: I006d2374b1d49fbf41ce60a39f08fe1ad96096c1
(cherry picked from commit 941f800a848a5dad4d4541a214477e95f738a5c8)

10 years agodocs: add gms core preview hoop-jumping
Robert Ly [Wed, 25 Jun 2014 01:10:33 +0000 (18:10 -0700)]
docs: add gms core preview hoop-jumping

Change-Id: Ic9602c0f3a309bd37dc5f628f4316b0124f0c8b3

10 years agoam 4aa9c6d5: DO NOT MERGE Revert "Revert "add \'coming soon\' page for google io...
Scott Main [Wed, 25 Jun 2014 01:02:00 +0000 (01:02 +0000)]
am 4aa9c6d5: DO NOT MERGE Revert "Revert "add \'coming soon\' page for google io announcements""

* commit '4aa9c6d5d38a1091bda7950baba5a9199898a728':
  DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""

10 years agoam 87670bcb: Revert "add \'coming soon\' page for google io announcements"
Scott Main [Wed, 25 Jun 2014 01:01:57 +0000 (01:01 +0000)]
am 87670bcb: Revert "add \'coming soon\' page for google io announcements"

* commit '87670bcb34c308731bbec177dae99cd9981656fb':
  Revert "add 'coming soon' page for google io announcements"

10 years agoam cca2a91a: add \'coming soon\' page for google io announcements
smain@google.com [Wed, 25 Jun 2014 01:01:54 +0000 (01:01 +0000)]
am cca2a91a: add \'coming soon\' page for google io announcements

* commit 'cca2a91a7cba2f0005b9d4a9a21a506ed191c348':
  add 'coming soon' page for google io announcements

10 years agoDO NOT MERGE
Scott Main [Wed, 25 Jun 2014 00:58:45 +0000 (00:58 +0000)]
DO NOT MERGE
Revert "Revert "add 'coming soon' page for google io announcements""

This reverts commit 87670bcb34c308731bbec177dae99cd9981656fb.

Change-Id: Ica55fdc9f345c55ab038ecbf836673be4f4bb1a0

10 years agoRevert "add 'coming soon' page for google io announcements"
Scott Main [Wed, 25 Jun 2014 00:57:48 +0000 (00:57 +0000)]
Revert "add 'coming soon' page for google io announcements"

This reverts commit cca2a91a7cba2f0005b9d4a9a21a506ed191c348.

Change-Id: I0212a0f0dbe63c14d796c9e764c0871790fddc46

10 years agoadd 'coming soon' page for google io announcements
smain@google.com [Wed, 25 Jun 2014 00:47:30 +0000 (17:47 -0700)]
add 'coming soon' page for google io announcements

Change-Id: I17e09aaa3c93060b306301ffa5012d8fcee3af22

10 years agoam 906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs
Andrew Solovay [Tue, 24 Jun 2014 21:39:27 +0000 (21:39 +0000)]
am 906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs

* commit '906eda45b27668e4c0a37b5ba3fbd530308883e6':
  docs: Fixed instructions on checking VM version.

10 years agoMerge "docs: Fixed instructions on checking VM version." into klp-docs
Andrew Solovay [Tue, 24 Jun 2014 21:35:31 +0000 (21:35 +0000)]
Merge "docs: Fixed instructions on checking VM version." into klp-docs

10 years agodocs: Fixed instructions on checking VM version.
Andrew Solovay [Tue, 24 Jun 2014 20:04:54 +0000 (13:04 -0700)]
docs: Fixed instructions on checking VM version.

Per IRogers@ , you check the VM version by calling
System.getProperty("java.vm.version") -- not, as previously
documented, "dalvik.vm.version" (Ian says there's no such property as
dalvik.vm.version.) BDC@ and/or AnwarG@, can you confirm?

Revised doc is staged to:

http://asolovay.mtv:9001/guide/practices/verifying-apps-art.html#GC_Migration

bug: 15836664
Change-Id: Ie5e2e058fa9ce033afd18a0f4079faa81bbf317e

10 years agoam bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text...
Dirk Dougherty [Sat, 21 Jun 2014 02:33:40 +0000 (02:33 +0000)]
am bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs

* commit 'bf66c17e4ad64c8420d3d3b5e8d789af00479eab':
  remove extraneous tag causing extra spacing between heading/text.

10 years agoam 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs
Joe Fernandez [Fri, 20 Jun 2014 21:41:30 +0000 (21:41 +0000)]
am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs

* commit '2d7b3dedd0ddccd5a44b7c289f5075ea1696c06c':
  ExoPlayer developer guide

10 years agoMerge "remove extraneous tag causing extra spacing between heading/text." into klp...
Dirk Dougherty [Sat, 21 Jun 2014 02:29:54 +0000 (02:29 +0000)]
Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs

10 years agoMerge "ExoPlayer developer guide" into klp-docs
Joe Fernandez [Fri, 20 Jun 2014 21:36:25 +0000 (21:36 +0000)]
Merge "ExoPlayer developer guide" into klp-docs

10 years agoExoPlayer developer guide
Joe Fernandez [Wed, 11 Jun 2014 06:45:58 +0000 (23:45 -0700)]
ExoPlayer developer guide

Change-Id: Icacaa0e68e602fc77946e10729b3649baaf4331b

10 years agoam c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Wed, 18 Jun 2014 00:10:34 +0000 (00:10 +0000)]
am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]

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

10 years agoam 4737af8b: docs: Added "Verifying for ART" to TOC.
Andrew Solovay [Fri, 13 Jun 2014 18:23:03 +0000 (18:23 +0000)]
am 4737af8b: docs: Added "Verifying for ART" to TOC.

* commit '4737af8b0aa77681270b6bc6478a946b71144e45':
  docs: Added "Verifying for ART" to TOC.