OSDN Git Service
Wei Liu [Mon, 14 Jul 2014 23:18:00 +0000 (23:18 +0000)]
am
9d43fa84: Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
* commit '
9d43fa84054dc3c0229f5138495f6b6cdf0477db':
Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
Wei Liu [Fri, 11 Jul 2014 18:56:21 +0000 (11:56 -0700)]
Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
BUG:
15589908
Change-Id: I69e176343906c8f87b8f50ba844b15e3e89f0c48
Michael Kolb [Fri, 11 Jul 2014 01:46:12 +0000 (01:46 +0000)]
am
0cb38d2e: Merge "Add configuration for activity thumbnails" into klp-modular-dev
* commit '
0cb38d2e5ab32fd34c8129f3c2d1c158bad9abc3':
Add configuration for activity thumbnails
Aaron Whyte [Fri, 11 Jul 2014 01:46:08 +0000 (01:46 +0000)]
am
f5e67474: Allow overlays to configure ConnectivityService\'s network sampling to not wake the device. This can increase clockwork device battery life. Bug:
15455204
* commit '
f5e6747440cc0d29c663a792e32d9618f842ecf2':
Allow overlays to configure ConnectivityService's network sampling to not wake the device. This can increase clockwork device battery life. Bug:
15455204
Andrew Solovay [Fri, 11 Jul 2014 01:46:03 +0000 (01:46 +0000)]
am
6462615c: Merge "docs: Changed screenshot to use layout name" into klp-modular-dev
* commit '
6462615c3913b74e14e356cf449115a012c39526':
docs: Changed screenshot to use layout name
Jason Sams [Thu, 17 Apr 2014 20:52:26 +0000 (13:52 -0700)]
Unhide RenderScript resize intrinsic
Change-Id: I450c83ad00bcb7d999aaf7d4bd7ea88d63ab8fea
Aaron Whyte [Thu, 10 Jul 2014 21:05:35 +0000 (14:05 -0700)]
Allow overlays to configure ConnectivityService's network sampling to not wake the device.
This can increase clockwork device battery life.
Bug:
15455204
Change-Id: Ifc551e6a522627dc8e5cfdfb8f56d4e3cbeea936
Michael Kolb [Thu, 10 Jul 2014 23:16:34 +0000 (23:16 +0000)]
Merge "Add configuration for activity thumbnails" into klp-modular-dev
Michael Kolb [Wed, 9 Jul 2014 23:02:49 +0000 (16:02 -0700)]
Add configuration for activity thumbnails
Bug:
15750584
Change-Id: I0b2bfb46022b46d7649f6d9ba9ba74cdfc70a6ea
Stephen Hines [Thu, 10 Jul 2014 00:21:50 +0000 (00:21 +0000)]
am
8348c351: am
4fea742c: Merge "Update copyFrom(BaseObj[]) for large objects."
* commit '
8348c35165001cdb16c73f077be257f653392535':
Update copyFrom(BaseObj[]) for large objects.
Stephen Hines [Thu, 10 Jul 2014 00:16:44 +0000 (00:16 +0000)]
am
4fea742c: Merge "Update copyFrom(BaseObj[]) for large objects."
* commit '
4fea742c07d2d55f29b7d61078914c5f83817313':
Update copyFrom(BaseObj[]) for large objects.
Elliott Hughes [Thu, 10 Jul 2014 00:16:43 +0000 (00:16 +0000)]
am
3964ea46: am
d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."
* commit '
3964ea46750cd5715f29ad4d9cada4a35208ad7a':
Switch frameworks/base/libs/androidfw to the new icu.
Elliott Hughes [Thu, 10 Jul 2014 00:16:29 +0000 (00:16 +0000)]
am
f072fda1: am
effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."
* commit '
f072fda13fd47d7dc7246cb821a26990d8fb271f':
Switch frameworks/base/core/jni to the new icu.
Robert Ly [Thu, 10 Jul 2014 00:11:33 +0000 (00:11 +0000)]
am
cc2af1c0: Merge "Revert "Change list for NDK Revision 10. Staged at: boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev
* commit '
cc2af1c010ae896ef6aea7c428876ea5d9a7dc73':
Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"
Elliott Hughes [Thu, 10 Jul 2014 00:08:33 +0000 (00:08 +0000)]
am
d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."
* commit '
d74f99d390d9a0e1c800ee68b1bc39c210aca989':
Switch frameworks/base/libs/androidfw to the new icu.
Elliott Hughes [Thu, 10 Jul 2014 00:08:29 +0000 (00:08 +0000)]
am
effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."
* commit '
effcc83e42638a5fa7eceaebe22081a1b9eaebaf':
Switch frameworks/base/core/jni to the new icu.
Quddus Chong [Wed, 9 Jul 2014 23:02:01 +0000 (23:02 +0000)]
am
9afee0df: docs: Added missing instructions for copying the Google Play Services library project.
* commit '
9afee0df49ce019bf8c8d1c7dc15857949637ccf':
docs: Added missing instructions for copying the Google Play Services library project.
Quddus Chong [Wed, 9 Jul 2014 21:38:04 +0000 (14:38 -0700)]
docs: Added missing instructions for copying the Google Play Services library project.
Change-Id: I04bbfce7e3901a1aa14a3c2a273674014c60ae17
Elliott Hughes [Wed, 9 Jul 2014 23:59:14 +0000 (23:59 +0000)]
Merge "Switch frameworks/base/core/jni to the new icu."
Elliott Hughes [Wed, 9 Jul 2014 23:56:11 +0000 (16:56 -0700)]
Switch frameworks/base/core/jni to the new icu.
Change-Id: Id12ce02da377ce78f318e10633c47f500237d9d9
Robert Ly [Wed, 9 Jul 2014 19:19:54 +0000 (19:19 +0000)]
am
d7880b6a: docs: fix packaging instructions again to reflect correct metadata name
* commit '
d7880b6a50aa0dbea66923a4672d360229ab3aca':
docs: fix packaging instructions again to reflect correct metadata name
Robert Ly [Wed, 9 Jul 2014 18:45:33 +0000 (11:45 -0700)]
docs: fix packaging instructions again to reflect correct metadata name
Change-Id: I61659811065ad5f0fa8f722f80793e707730604c
Ricardo Cervera [Wed, 9 Jul 2014 18:38:20 +0000 (18:38 +0000)]
am
e34167ce: Merge "docs: Fixed minor issues with Wear docs. Bug:
16062631" into klp-modular-dev
* commit '
e34167cef73e23c4be4bf5d7a1517e609122d652':
docs: Fixed minor issues with Wear docs. Bug:
16062631
Ricardo Cervera [Wed, 9 Jul 2014 18:38:16 +0000 (18:38 +0000)]
am
3a958b9f: docs: Fixed nav bar color in material docs. Bug:
16160906
* commit '
3a958b9f851a8985bed5fac1499c5553ff566b9e':
docs: Fixed nav bar color in material docs. Bug:
16160906
Robert Ly [Wed, 9 Jul 2014 18:33:49 +0000 (18:33 +0000)]
am
a0d38aa4: Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev
* commit '
a0d38aa4e58eee27b561420047d0aafcdaed93f1':
docs: remove gms core preview for wear and redirect
Ricardo Cervera [Wed, 9 Jul 2014 16:18:18 +0000 (09:18 -0700)]
docs: Fixed nav bar color in material docs. Bug:
16160906
Change-Id: I56eb7f4d0e9a0a24b1fb38f08dd8ccba6c91dd17
Robin Lee [Wed, 9 Jul 2014 17:43:56 +0000 (17:43 +0000)]
am
1f0180bf: am
74803e55: Merge "Make misc config directory during user creation"
* commit '
1f0180bfa877373b239a5675f715288db829fa75':
Make misc config directory during user creation
Robin Lee [Wed, 9 Jul 2014 17:39:13 +0000 (17:39 +0000)]
am
74803e55: Merge "Make misc config directory during user creation"
* commit '
74803e559caffe235b86dc52cf76ef98343c0d74':
Make misc config directory during user creation
Robert Ly [Wed, 9 Jul 2014 16:50:42 +0000 (16:50 +0000)]
am
33f5a318: Merge "docs: surface ui toolkit at a higher level" into klp-modular-dev
* commit '
33f5a318b981a69542bfd158e3fec5814135665a':
docs: surface ui toolkit at a higher level
Robert Ly [Wed, 9 Jul 2014 16:28:29 +0000 (16:28 +0000)]
am
db520137: Merge "docs: fix wear packaging for paid apps instructions" into klp-modular-dev
* commit '
db520137dbd67d4b8ec65011accadda7e25ec844':
docs: fix wear packaging for paid apps instructions
Robert Ly [Wed, 9 Jul 2014 15:51:13 +0000 (15:51 +0000)]
am
e0b5829e: Merge "docs: fix 2d picker image description" into klp-modular-dev
* commit '
e0b5829eb1eac1be768343371da71e7d53d9eff5':
docs: fix 2d picker image description
Robert Ly [Wed, 9 Jul 2014 15:06:37 +0000 (15:06 +0000)]
am
6f52e7be: Merge "docs: fix link to messages doc" into klp-modular-dev
* commit '
6f52e7be188781a906cc53dcd96268ffbfdfc283':
docs: fix link to messages doc
Ricardo Cervera [Wed, 9 Jul 2014 18:34:15 +0000 (18:34 +0000)]
Merge "docs: Fixed minor issues with Wear docs. Bug:
16062631" into klp-modular-dev
Ricardo Cervera [Wed, 9 Jul 2014 17:46:54 +0000 (10:46 -0700)]
docs: Fixed minor issues with Wear docs. Bug:
16062631
Change-Id: Ieaa02cfedd1b9b6f59c6937a056c8d4f4eb4188e
Robert Ly [Wed, 9 Jul 2014 18:28:38 +0000 (18:28 +0000)]
Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 16:46:45 +0000 (09:46 -0700)]
docs: remove gms core preview for wear and redirect
Change-Id: I8dd618a8fc99034cd73927d4aa312fe871081f83
Robert Ly [Wed, 9 Jul 2014 16:42:29 +0000 (09:42 -0700)]
docs: surface ui toolkit at a higher level
Change-Id: If17cebda4606404f13d10ecb1540eda75b5e11ec
Robert Ly [Wed, 9 Jul 2014 16:23:23 +0000 (09:23 -0700)]
docs: fix wear packaging for paid apps instructions
Change-Id: Ibf2cbe2e4bcb7e998665b10c5632c786dcc90e76
Robert Ly [Wed, 9 Jul 2014 15:46:37 +0000 (08:46 -0700)]
docs: fix 2d picker image description
Change-Id: Id554a7090986e71a502dc070468d26f8d546cc2c
Robert Ly [Wed, 9 Jul 2014 14:59:07 +0000 (07:59 -0700)]
docs: fix link to messages doc
Change-Id: I382a2ec26634f8d7427344657de0a66b187562cb
Stephen Hines [Thu, 10 Jul 2014 00:10:05 +0000 (00:10 +0000)]
Merge "Update copyFrom(BaseObj[]) for large objects."
Tim Murray [Tue, 1 Jul 2014 23:56:18 +0000 (16:56 -0700)]
Update copyFrom(BaseObj[]) for large objects.
Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
Elliott Hughes [Wed, 9 Jul 2014 23:59:58 +0000 (23:59 +0000)]
Merge "Switch frameworks/base/libs/androidfw to the new icu."
Elliott Hughes [Wed, 9 Jul 2014 23:58:28 +0000 (16:58 -0700)]
Switch frameworks/base/libs/androidfw to the new icu.
Change-Id: Id82830750dd7e83bbc66811a1133b403cc697c97
Robert Ly [Wed, 9 Jul 2014 16:44:09 +0000 (16:44 +0000)]
Merge "docs: surface ui toolkit at a higher level" into klp-modular-dev
Andrew Solovay [Thu, 10 Jul 2014 16:54:28 +0000 (16:54 +0000)]
Merge "docs: Changed screenshot to use layout name" into klp-modular-dev
Andrew Solovay [Wed, 9 Jul 2014 23:31:45 +0000 (16:31 -0700)]
docs: Changed screenshot to use layout name
Updated doc is staged to:
http://asolovay.mtv:9125/guide/topics/ui/layout/linear.html#Example
bug:
15940125
Change-Id: I1628fd6527a02516bf288340059db433f591ac7e
Robert Ly [Thu, 10 Jul 2014 00:05:13 +0000 (00:05 +0000)]
Merge "Revert "Change list for NDK Revision 10. Staged at: boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev
Robert Ly [Thu, 10 Jul 2014 00:04:45 +0000 (00:04 +0000)]
Revert "Change list for NDK Revision 10. Staged at: boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"
This reverts commit
42fcd1463d416ede744550810bdfd7974e685f15.
Change-Id: I0956e4e07b558c1f445d3209a52a54974e060b99
Robert Ly [Wed, 9 Jul 2014 15:48:19 +0000 (15:48 +0000)]
Merge "docs: fix 2d picker image description" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 15:02:11 +0000 (15:02 +0000)]
Merge "docs: fix link to messages doc" into klp-modular-dev
Brian Carlstrom [Wed, 9 Jul 2014 12:36:47 +0000 (12:36 +0000)]
am
5aba0149: am
b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"
* commit '
5aba0149b953fb8e85851811dde995fb35c10051':
Make dex2oat heap size product configurable [frameworks/base]
Brian Carlstrom [Wed, 9 Jul 2014 12:21:54 +0000 (12:21 +0000)]
am
b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"
* commit '
b85afb38e88ceca61af2855e30d34bc6ec4d32d9':
Make dex2oat heap size product configurable [frameworks/base]
Deepanshu Gupta [Wed, 9 Jul 2014 00:06:22 +0000 (00:06 +0000)]
am
d3a77b16: am
e7ef4dde: 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 '
d3a77b16c7e0cd54cde9a855654fe02897a50b87':
Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Wed, 9 Jul 2014 00:02:06 +0000 (00:02 +0000)]
am
e7ef4dde: 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 '
e7ef4dde3cd9a9b7f6e8317563158b954ca679be':
Change font family name. [DO NOT MERGE]
David Friedman [Wed, 9 Jul 2014 00:01:55 +0000 (00:01 +0000)]
am
d9843b2e: Merge "Change list for NDK Revision 10. Staged at: boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html" into klp-modular-dev
* commit '
d9843b2ebeb9a99b620aae3a3d17ea64fb00358a':
Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html
Deepanshu Gupta [Wed, 9 Jul 2014 00:01:51 +0000 (00:01 +0000)]
am
9f595d98: am
6077f5f2: 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 '
9f595d98979151860d76516f37bcc47238370f44':
Add a script to rename fonts for SDK. [DO NOT MERGE]
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]
Deepanshu Gupta [Tue, 8 Jul 2014 23:54:06 +0000 (23:54 +0000)]
am
6077f5f2: 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 '
6077f5f2340a26954033c5e1724506efbe478fba':
Add a script to rename fonts for SDK. [DO NOT MERGE]
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]
Deepanshu Gupta [Tue, 8 Jul 2014 23:50:15 +0000 (23:50 +0000)]
am
6dfce3f7: am
00a10334: am
931e049e: am
5414f83d: (-s ours) am
d2829b49: am
432d16f9: Change font family name. [DO NOT MERGE]
* commit '
6dfce3f72c6e315013e323f4c1bb918c449d7d61':
Change font family name. [DO NOT MERGE]
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]
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]
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]
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]
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]
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]
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]
Deepanshu Gupta [Tue, 8 Jul 2014 23:38:26 +0000 (23:38 +0000)]
am
c295c08f: am
efa0e90c: am
e63b7ad3: am
5acf782c: (-s ours) am
d751eed4: am
b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit '
c295c08fb4d08e4f335754aa62ff0d957a339109':
Add a script to rename fonts for SDK. [DO NOT MERGE]
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]
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]
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]
Deepanshu Gupta [Tue, 8 Jul 2014 23:33:00 +0000 (23:33 +0000)]
am
61d3dea6: am
8c8bb83e: am
8e11659a: Change font family name. [DO NOT MERGE]
* commit '
61d3dea672ed8f2f4f90860580c37766b0197a58':
Change font family name. [DO NOT MERGE]
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]
Robert Ly [Wed, 9 Jul 2014 16:25:05 +0000 (16:25 +0000)]
Merge "docs: fix wear packaging for paid apps instructions" into klp-modular-dev
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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)
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)
Brian Carlstrom [Wed, 9 Jul 2014 04:07:56 +0000 (04:07 +0000)]
Merge "Make dex2oat heap size product configurable [frameworks/base]"
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
Brian Carlstrom [Tue, 8 Jul 2014 17:40:59 +0000 (10:40 -0700)]
Make dex2oat heap size product configurable [frameworks/base]
Bug:
15919420
Change-Id: I9b7b4f60826fc9b0cc6bb3765ceaa36542425006
Stephen Hines [Tue, 8 Jul 2014 21:29:14 +0000 (21:29 +0000)]
am
957ec05e: am
70a3c558: Merge "Adds support for multi-input kernels to Frameworks/Base/RS."
* commit '
957ec05ef67b5909e9e66bcf28eae29c2dc148b3':
Adds support for multi-input kernels to Frameworks/Base/RS.
Stephen Hines [Tue, 8 Jul 2014 21:25:19 +0000 (21:25 +0000)]
am
70a3c558: Merge "Adds support for multi-input kernels to Frameworks/Base/RS."
* commit '
70a3c558645f8e693ce37577fdd61b8d1fd4ed9a':
Adds support for multi-input kernels to Frameworks/Base/RS.
Ricardo Cervera [Tue, 8 Jul 2014 17:36:31 +0000 (17:36 +0000)]
am
f4d498f1: Merge "docs: Release notes for support lib v20" into klp-modular-dev
* commit '
f4d498f17f5abc9297dc5c3eff0858f773828044':
docs: Release notes for support lib v20
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
Ricardo Cervera [Mon, 7 Jul 2014 20:15:56 +0000 (13:15 -0700)]
docs: Release notes for support lib v20
Change-Id: I82bbad9ad8945e9437b790e0f47622ef00b318f1
OSDN Git Service
