git.osdn.net Git - android-x86/frameworks-base.git/log

Deepanshu Gupta [Fri, 18 Jul 2014 21:50:15 +0000 (21:50 +0000)]

am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '964591a6e1be2d19dcd00229aa5ed50acd4847e6':
Fix default level flags for bidi. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:44:52 +0000 (21:44 +0000)]

am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'c3a7763b84a6a20f07ed2b42e58ac0911fac984c':
Fix default level flags for bidi. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:42:10 +0000 (21:42 +0000)]

am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev

* commit '4627c98da4ecb66e32a3273ea3713df528cda6b2':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:36:29 +0000 (21:36 +0000)]

am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '918ca12ffc09a96194112edf3540d94c32918a07':
Fix default level flags for bidi. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:32:52 +0000 (21:32 +0000)]

am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]

* commit '710a55b419908068529a8e95c4eba88297f67e3f':
Fix default level flags for bidi. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:31:33 +0000 (21:31 +0000)]

am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
Fix default level flags for bidi. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:33:28 +0000 (21:33 +0000)]

Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev

commit | commitdiff | tree

Deepanshu Gupta [Thu, 10 Jul 2014 01:10:34 +0000 (18:10 -0700)]

Fix default level flags for bidi. [DO NOT MERGE]

Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)

commit | commitdiff | tree

Deepanshu Gupta [Thu, 10 Jul 2014 01:10:34 +0000 (18:10 -0700)]

Fix default level flags for bidi. [DO NOT MERGE]

Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)

commit | commitdiff | tree

Deepanshu Gupta [Thu, 10 Jul 2014 00:27:07 +0000 (17:27 -0700)]

Fix style resolution for styles with '.' [DO NOT MERGE]

Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:57:43 +0000 (23:57 +0000)]

am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:52:33 +0000 (23:52 +0000)]

am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

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

commit | commitdiff | tree

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:48:14 +0000 (23:48 +0000)]

am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

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

commit | commitdiff | tree

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:43:39 +0000 (23:43 +0000)]

am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

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

commit | commitdiff | tree

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:38:48 +0000 (23:38 +0000)]

am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

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

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:30:20 +0000 (23:30 +0000)]

am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

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

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:25:22 +0000 (23:25 +0000)]

am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

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

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:23:21 +0000 (23:23 +0000)]

am e30d3fdd: Change font family name. [DO NOT MERGE]

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

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

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)

commit | commitdiff | tree

Deepanshu Gupta [Sat, 28 Jun 2014 01:39:32 +0000 (18:39 -0700)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Deepanshu Gupta [Sat, 28 Jun 2014 01:39:32 +0000 (18:39 -0700)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 19:37:20 +0000 (19:37 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:30:19 +0000 (18:30 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:30:06 +0000 (18:30 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:29:14 +0000 (18:29 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:22:35 +0000 (18:22 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:19:04 +0000 (18:19 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:18:46 +0000 (18:18 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 19:37:29 +0000 (19:37 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:28:46 +0000 (18:28 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:15:54 +0000 (18:15 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:02:50 +0000 (18:02 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:00:38 +0000 (18:00 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:22:30 +0000 (18:22 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:18:57 +0000 (18:18 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:18:40 +0000 (18:18 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:15:48 +0000 (18:15 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:08:17 +0000 (18:08 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:02:45 +0000 (18:02 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:00:33 +0000 (18:00 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

smain@google.com [Wed, 25 Jun 2014 18:07:05 +0000 (11:07 -0700)]

update wear icons on preview page

Change-Id: I17fc5a7d1ba637ea0eb557eae50aea76667e2430

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Robert Ly [Wed, 25 Jun 2014 03:57:34 +0000 (03:57 +0000)]

Merge "docs: add gms core preview hoop-jumping" into klp-docs

commit | commitdiff | tree

smain@google.com [Wed, 25 Jun 2014 02:06:47 +0000 (02:06 +0000)]

am ec6f162f: DO NOT MERGE!

* commit 'ec6f162f0e3fc0d68c1ec0ac30ff1353bf4f1e97':
DO NOT MERGE!

commit | commitdiff | tree

smain@google.com [Wed, 25 Jun 2014 02:06:43 +0000 (02:06 +0000)]