OSDN Git Service
Robert Ly [Sat, 21 Jun 2014 20:16:37 +0000 (20:16 +0000)]
am
50f08149: Merge "docs: add whitelisting instructions and new index icons" into klp-modular-dev
* commit '
50f08149ec7d5ede16f44a855ccf4db450336e93':
docs: add whitelisting instructions and new index icons
Dirk Dougherty [Sat, 21 Jun 2014 20:16:25 +0000 (20:16 +0000)]
am
ceaa57c9: am
39b707c8: am
bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs
* commit '
ceaa57c927ad61ed8a8a1fc8c1b5c28d5472a50a':
remove extraneous tag causing extra spacing between heading/text.
smain@google.com [Sat, 21 Jun 2014 20:16:16 +0000 (20:16 +0000)]
am
e77f41a6: prettier sdk buttons
* commit '
e77f41a6e388258d24a29228b8f41d01bd9ae81f':
prettier sdk buttons
smain@google.com [Sat, 21 Jun 2014 20:16:07 +0000 (20:16 +0000)]
am
941f800a: 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
* commit '
941f800a848a5dad4d4541a214477e95f738a5c8':
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
smain@google.com [Sat, 21 Jun 2014 20:15:59 +0000 (20:15 +0000)]
am
371d68cc: add link back to main dev site home
* commit '
371d68ccb03e4c3827f8b548ebb128cddd8c4bd3':
add link back to main dev site home
Michael Kolb [Sat, 21 Jun 2014 20:15:47 +0000 (20:15 +0000)]
am
270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev
* commit '
270c099faf63868dcc21836a84de778337ff3be9':
Move emulator check & save system properties access
Craig Mautner [Sat, 21 Jun 2014 20:15:36 +0000 (20:15 +0000)]
am
90c9fffc: Merge "Do not delete stack if empty task is being reused." into klp-modular-dev
* commit '
90c9fffc956589f06d4a0c45a893c5db6a85fabc':
Do not delete stack if empty task is being reused.
Michael Kolb [Sat, 21 Jun 2014 20:15:24 +0000 (20:15 +0000)]
am
db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev
* commit '
db9fed74c2bbf97157683b47f3cbdcd04c729839':
Make WindowInsets.isRound work with emulator
Joe Fernandez [Sat, 21 Jun 2014 20:15:12 +0000 (20:15 +0000)]
am
8b19cdf7: am
845835c7: am
2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs
* commit '
8b19cdf7535b193c2633bc311038521f749ebc70':
ExoPlayer developer guide
Robert Ly [Sat, 21 Jun 2014 20:15:07 +0000 (20:15 +0000)]
Robert Ly [Sat, 21 Jun 2014 20:14:59 +0000 (20:14 +0000)]
am
8c573178: Merge "docs: fix l preview bugs" into klp-modular-dev
* commit '
8c573178dfa68fc57594124128c9fd8e2abe8f01':
docs: fix l preview bugs
Robert Ly [Sat, 21 Jun 2014 20:14:55 +0000 (20:14 +0000)]
am
448f823e: Merge "docs: fix margins and add partners back" into klp-modular-dev
* commit '
448f823e2048e2e5843557fe255b751c5a1b2961':
docs: fix margins and add partners back
Dirk Dougherty [Sat, 21 Jun 2014 02:37:39 +0000 (02:37 +0000)]
am
39b707c8: am
bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs
* commit '
39b707c8d543149e449c04e502ee84361fe3fa47':
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.
smain@google.com [Sat, 21 Jun 2014 02:06:06 +0000 (19:06 -0700)]
prettier sdk buttons
Change-Id: I4b15c88e4e218dc2d964470d6010cdb3f19d748c
smain@google.com [Wed, 18 Jun 2014 23:13:56 +0000 (16:13 -0700)]
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
smain@google.com [Sat, 21 Jun 2014 00:45:37 +0000 (17:45 -0700)]
add link back to main dev site home
Change-Id: Icab3fbd6a0a62d7a83ab41061956614d575b7bb4
Dan Albert [Fri, 20 Jun 2014 22:40:25 +0000 (22:40 +0000)]
am
a642a9ea: am
d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."
* commit '
a642a9ea3b2288b431ecb284b94a4657ae62889d':
Use openssl's SHA1 instead of bionic's.
smain@google.com [Fri, 20 Jun 2014 22:30:25 +0000 (22:30 +0000)]
am
4d30b1e6: make buttons "primary" red
* commit '
4d30b1e663d975357e0e748a1bf4ab094e3afdde':
make buttons "primary" red
smain@google.com [Fri, 20 Jun 2014 22:30:02 +0000 (22:30 +0000)]
am
78dfcb3a: Merge "revised homepage to use static version of top banner" into klp-modular-dev
* commit '
78dfcb3aba8883ae13c62103172277dda32d87f1':
revised homepage to use static version of top banner
Joe Fernandez [Fri, 20 Jun 2014 21:46:57 +0000 (21:46 +0000)]
am
845835c7: am
2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs
* commit '
845835c779557392c1b25a25082f6fe66ed0f066':
ExoPlayer developer guide
Robert Ly [Fri, 20 Jun 2014 21:42:12 +0000 (14:42 -0700)]
fix build
Change-Id: I9d9610137823656b63e5983ba93d390b2ab4cabc
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
Robert Ly [Sat, 21 Jun 2014 07:58:18 +0000 (07:58 +0000)]
Merge "docs: add whitelisting instructions and new index icons" into klp-modular-dev
Robert Ly [Sat, 21 Jun 2014 07:56:48 +0000 (00:56 -0700)]
docs: add whitelisting instructions and new index icons
Change-Id: If720e2a5c3cae1d5cceff397d06001e551443fce
Michael Kolb [Fri, 20 Jun 2014 22:20:14 +0000 (22:20 +0000)]
Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev
Michael Kolb [Fri, 20 Jun 2014 20:28:44 +0000 (13:28 -0700)]
Make WindowInsets.isRound work with emulator
Bug:
15775489
Change-Id: I53a14ccd3be776d46c9cea43c0d5d3f41674dd75
Robert Ly [Fri, 20 Jun 2014 21:14:38 +0000 (21:14 +0000)]
Merge "docs: fix l preview bugs" into klp-modular-dev
Robert Ly [Fri, 20 Jun 2014 16:33:39 +0000 (09:33 -0700)]
docs: fix l preview bugs
Change-Id: Ic89fea620ba458c604ccdeeb6da471c807a71fef
Michael Kolb [Fri, 20 Jun 2014 23:15:59 +0000 (23:15 +0000)]
Merge "Move emulator check & save system properties access" into klp-modular-dev
Michael Kolb [Fri, 20 Jun 2014 22:39:04 +0000 (15:39 -0700)]
Move emulator check & save system properties access
Bug:
15775489
Change-Id: I375aee36b212ae044101a65b65c51e6f889fd263
Dan Albert [Fri, 20 Jun 2014 19:53:36 +0000 (19:53 +0000)]
am
d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."
* commit '
d24f557798d04bdd50f2a45e48b70b009a205b4a':
Use openssl's SHA1 instead of bionic's.
Baligh Uddin [Fri, 20 Jun 2014 19:48:52 +0000 (19:48 +0000)]
am
1b3a5217: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
1b3a52170ab0f2ec82532a689d271eaf8b8997f9':
Import translations. DO NOT MERGE
Robert Ly [Fri, 20 Jun 2014 19:48:48 +0000 (19:48 +0000)]
am
c9334fb1: fix typo on lmp-prev page
* commit '
c9334fb1b884031ad0f522085542e80e71f73685':
fix typo on lmp-prev page
Robert Ly [Fri, 20 Jun 2014 19:48:40 +0000 (19:48 +0000)]
am
3323e554: Merge "add new image and landing page for l-preview" into klp-modular-dev
* commit '
3323e554391e7cf5ddba03d9f468c8acfb35ee0e':
add new image and landing page for l-preview
Elliott Hughes [Fri, 20 Jun 2014 16:34:36 +0000 (16:34 +0000)]
am
ff6b0e24: am
f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"
* commit '
ff6b0e24725c642f0681e214f143a8151e4e6bea':
Fixed VM memory leak in AudioSystem JNI interface
Elliott Hughes [Fri, 20 Jun 2014 16:30:40 +0000 (16:30 +0000)]
am
f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"
* commit '
f18961066b7029652dacb9016bacbf192a6cf73d':
Fixed VM memory leak in AudioSystem JNI interface
smain@google.com [Fri, 20 Jun 2014 05:33:50 +0000 (22:33 -0700)]
make buttons "primary" red
Change-Id: Ife5f2b565f52621df953593b9b3bd7cc05500f81
Dan Albert [Fri, 20 Jun 2014 19:51:20 +0000 (19:51 +0000)]
Merge "Use openssl's SHA1 instead of bionic's."
Elliott Hughes [Fri, 20 Jun 2014 16:26:45 +0000 (16:26 +0000)]
Merge "Fixed VM memory leak in AudioSystem JNI interface"
Robert Ly [Fri, 20 Jun 2014 21:14:24 +0000 (21:14 +0000)]
Merge "docs: fix margins and add partners back" into klp-modular-dev
Robert Ly [Fri, 20 Jun 2014 04:23:46 +0000 (21:23 -0700)]
docs: fix margins and add partners back
Change-Id: I0430079f136fb6197a9a53e44f55a0292d8975a7
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
smain@google.com [Fri, 20 Jun 2014 01:29:18 +0000 (01:29 +0000)]
Merge "revised homepage to use static version of top banner" into klp-modular-dev
smain@google.com [Fri, 20 Jun 2014 00:06:54 +0000 (17:06 -0700)]
revised homepage to use static version of top banner
Change-Id: Id337f67640a648cf28cbf20ccd2dba1524475aae
Craig Mautner [Fri, 20 Jun 2014 22:35:07 +0000 (22:35 +0000)]
Merge "Do not delete stack if empty task is being reused." into klp-modular-dev
Craig Mautner [Fri, 20 Jun 2014 21:04:39 +0000 (14:04 -0700)]
Do not delete stack if empty task is being reused.
If a task is being cleared due to Intent flags and that clearing
was causing the last activity in the last task on a stack to be
deleted, then we were deleting the stack. Immediately after
this we were refilling the task with the same activity but the
stack had already been deleted.
This fix preserves the task and stack when it is only being
cleared for the new activity.
Fixes bug
15611901.
Change-Id: I7bcfa826d0852d9c640daa73fe1324b89471fecd
Joe Fernandez [Fri, 20 Jun 2014 21:36:25 +0000 (21:36 +0000)]
Merge "ExoPlayer developer guide" into klp-docs
Joe Fernandez [Wed, 11 Jun 2014 06:45:58 +0000 (23:45 -0700)]
ExoPlayer developer guide
Change-Id: Icacaa0e68e602fc77946e10729b3649baaf4331b
Baligh Uddin [Fri, 20 Jun 2014 00:08:58 +0000 (00:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Robert Ly [Fri, 20 Jun 2014 00:00:55 +0000 (17:00 -0700)]
fix typo on lmp-prev page
Change-Id: I3cc4c457d12c71a466b2be16022ac1e6835227b3
Baligh Uddin [Thu, 19 Jun 2014 23:53:45 +0000 (16:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7f78f8188fd6b2f04f96a5846c13314687c2554e
Auto-generated-cl: translation import
Robert Ly [Thu, 19 Jun 2014 23:55:22 +0000 (23:55 +0000)]
Merge "add new image and landing page for l-preview" into klp-modular-dev
Robert Ly [Thu, 19 Jun 2014 23:49:06 +0000 (16:49 -0700)]
add new image and landing page for l-preview
Change-Id: Ide3917a9795269b6606e3a7349c49b1d5b9b04b2
smain@google.com [Thu, 19 Jun 2014 19:45:47 +0000 (19:45 +0000)]
am
b6974e92: add info about enabling USB debugging to adb doc. part of initiative to document the flash process for L preview.
* commit '
b6974e9261f9d0bb4af39950496428cd2b45eb6d':
add info about enabling USB debugging to adb doc. part of initiative to document the flash process for L preview.
smain@google.com [Thu, 19 Jun 2014 17:57:11 +0000 (10:57 -0700)]
add info about enabling USB debugging to adb doc.
part of initiative to document the flash process for L preview.
Change-Id: I5177ba63d1cb2f291002b0fdb0b0209ca9e17072
Jeff Sharkey [Thu, 19 Jun 2014 16:11:51 +0000 (16:11 +0000)]
am
447b68e7: am
b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak"
* commit '
447b68e767943fdde297d78321378e2623985a0a':
Fixing parcel leaks to avoid virtual memory leak
Jeff Sharkey [Thu, 19 Jun 2014 16:07:52 +0000 (16:07 +0000)]
am
b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak"
* commit '
b5e05cffccc2ca1ce85ce9952b6c6845b46aa5c7':
Fixing parcel leaks to avoid virtual memory leak
Robert Ly [Thu, 19 Jun 2014 08:53:46 +0000 (08:53 +0000)]
am
4d521ed9: Merge "new lmp prev landing page" into klp-modular-dev
* commit '
4d521ed9663a7a4f938b3c09f06af557614ca3d3':
new lmp prev landing page
Ricardo Cervera [Thu, 19 Jun 2014 08:53:29 +0000 (08:53 +0000)]
am
10276c32: Merge "docs: Updated the screenshot for the Android Studio page." into klp-modular-dev
* commit '
10276c32ec0a15fa444c1f3fa6ec9e8d1002cb6e':
docs: Updated the screenshot for the Android Studio page.
Stephen Hines [Thu, 19 Jun 2014 03:18:17 +0000 (03:18 +0000)]
am
ff83ed2d: am
b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."
* commit '
ff83ed2dc34f0595bcff2cb7b5d71bb39191963e':
Create FieldPacker.getPos() to get the actual amount of data used for FP.
Stephen Hines [Thu, 19 Jun 2014 03:13:37 +0000 (03:13 +0000)]
am
b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."
* commit '
b02dadd47c20b65569413cb4575c6050fe7b609f':
Create FieldPacker.getPos() to get the actual amount of data used for FP.
Quddus Chong [Thu, 19 Jun 2014 03:12:34 +0000 (03:12 +0000)]
am
84611a1f: Merge "docs: Updates to L Preview Highlights." into klp-modular-dev
* commit '
84611a1fe13299e3279d9bc5b0a2ec33d54c7e92':
docs: Updates to L Preview Highlights.
Brian Carlstrom [Thu, 19 Jun 2014 02:08:10 +0000 (02:08 +0000)]
am
f8077cf2: am
8e21e215: Merge "Switch from core to core-libart"
* commit '
f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc':
Switch from core to core-libart
Brian Carlstrom [Thu, 19 Jun 2014 02:03:35 +0000 (02:03 +0000)]
am
8e21e215: Merge "Switch from core to core-libart"
* commit '
8e21e21550eddce01ad06fdf05b342993bf44c6a':
Switch from core to core-libart
Robert Ly [Thu, 19 Jun 2014 06:52:33 +0000 (06:52 +0000)]
Merge "new lmp prev landing page" into klp-modular-dev
Robert Ly [Thu, 19 Jun 2014 02:56:05 +0000 (19:56 -0700)]
new lmp prev landing page
Change-Id: I28cf943e21fc9b1e3c044830ac21079d5464dee8
Quddus Chong [Thu, 19 Jun 2014 03:09:03 +0000 (03:09 +0000)]
Merge "docs: Updates to L Preview Highlights." into klp-modular-dev
Quddus Chong [Wed, 18 Jun 2014 19:19:06 +0000 (12:19 -0700)]
docs: Updates to L Preview Highlights.
Change-Id: Ie64c90eebab7fc740c30f6881e6408d634e0c919
Jason Sams [Wed, 18 Jun 2014 23:08:35 +0000 (23:08 +0000)]
am
802aaf3b: am
47de3060: Merge "Fix element size on 64b"
* commit '
802aaf3b9d029e8f6fdb1bf0a81758484801d330':
Fix element size on 64b
Jason Sams [Wed, 18 Jun 2014 22:54:08 +0000 (22:54 +0000)]
am
47de3060: Merge "Fix element size on 64b"
* commit '
47de306050576535014ff2b0c08006f951eea2ee':
Fix element size on 64b
Jeff Sharkey [Thu, 19 Jun 2014 16:02:11 +0000 (16:02 +0000)]
Merge "Fixing parcel leaks to avoid virtual memory leak"
Maunik Shah [Thu, 19 Jun 2014 08:48:39 +0000 (14:18 +0530)]
Fixing parcel leaks to avoid virtual memory leak
Client has to call recycle() on parcel object after its usage
otherwise native layer of binder won't clear the resources of
parcel which were allocated for IPC
Change-Id: Ib31ddcc92aa4ebd80bb66729922b9133692e9c9e
Stephen Hines [Thu, 19 Jun 2014 03:04:32 +0000 (03:04 +0000)]
Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."
Brian Carlstrom [Thu, 19 Jun 2014 01:59:38 +0000 (01:59 +0000)]
Merge "Switch from core to core-libart"
Brian Carlstrom [Wed, 18 Jun 2014 22:11:01 +0000 (15:11 -0700)]
Switch from core to core-libart
Bug:
14298175
Change-Id: I89db18bf3d88f9511cb2ad943c64ecdbaf09d96f
Ricardo Cervera [Thu, 19 Jun 2014 05:29:37 +0000 (05:29 +0000)]
Merge "docs: Updated the screenshot for the Android Studio page." into klp-modular-dev
Mark Renouf [Wed, 18 Jun 2014 19:37:02 +0000 (19:37 +0000)]
am
f2dcb390: Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev
* commit '
f2dcb390444ffb42cf8637c99f53d821917554e6':
Limit swipe dismiss progress to positive values
Robert Ly [Wed, 18 Jun 2014 18:33:31 +0000 (18:33 +0000)]
am
5cfea842: Merge "docs: add allowembedded" into klp-modular-dev
* commit '
5cfea84264911b93057a667cbcaf90e10740d658':
docs: add allowembedded
Ricardo Cervera [Tue, 17 Jun 2014 19:32:28 +0000 (12:32 -0700)]
docs: Updated the screenshot for the Android Studio page.
Change-Id: Ia2a91bf9341dd9a0ee8572e6de1998cb41ac5c92
Quddus Chong [Wed, 18 Jun 2014 16:07:41 +0000 (16:07 +0000)]
am
ef655f26: docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug:
15709471
* commit '
ef655f26fceba274b75e41f0b085434aa12914c8':
docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug:
15709471
Quddus Chong [Wed, 18 Jun 2014 15:56:28 +0000 (08:56 -0700)]
docs: Added "games" metadata tag for Play Games landing page in d.a.c.
Bug:
15709471
Change-Id: Ibac4bd844245e71a8cb975bd86d07f9df0c25be5
Stephen Hines [Wed, 18 Jun 2014 00:25:04 +0000 (17:25 -0700)]
Create FieldPacker.getPos() to get the actual amount of data used for FP.
We need larger buffers to handle 64-bit RS object types, but 32-bit code
will never fill all of the getData().length bytes. This allows us to retain
our verification code.
We have to modify an existing use of FieldPacker that was doing partial
updates of the underlying buffer. This was really relying on the old data
to be implicitly selected and written back, but that is not guaranteed by
the original API. This also required a fix to the FieldPacker.reset() API,
which was not allowing the FieldPacker to ever point to the final entry in
its buffer.
Change-Id: Idcd52790ac2b0ab1eff3f043e7eec2832953f04b
Griff Hazen [Wed, 18 Jun 2014 03:18:24 +0000 (03:18 +0000)]
am
f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev
* commit '
f546eeb1ede3c33ca3ec7fff6b8deb9d4e5cbc3e':
DO NOT MERGE Reduce chance of notification listener dropped messages.
Robert Ly [Wed, 18 Jun 2014 03:13:23 +0000 (03:13 +0000)]
am
95df0762: Merge "docs: Edits to the L Preview API overview." into klp-modular-dev
* commit '
95df0762c40bb79418d5fc8d59bc997a419e6250':
docs: Edits to the L Preview API overview.
Robert Ly [Wed, 18 Jun 2014 03:13:19 +0000 (03:13 +0000)]
am
b5d79bd2: Merge "Android TV Landing Page" into klp-modular-dev
* commit '
b5d79bd2ab8b0382e05f38653ce0fbb56290ea58':
Android TV Landing Page
Joe Fernandez [Wed, 18 Jun 2014 03:13:15 +0000 (03:13 +0000)]
am
8e18e016: Wear Landing page fixes
* commit '
8e18e0169d3488e9a9ca02d1ff7aee06932a54a3':
Wear Landing page fixes
Joe Fernandez [Wed, 18 Jun 2014 03:00:33 +0000 (20:00 -0700)]
Wear Landing page fixes
- fixed scroll animation
- un-hardcoded G+ widget
Change-Id: I679d6d5baf65516a163bb01ec3bf90c1b53e647b
Deepanshu Gupta [Wed, 18 Jun 2014 00:20:35 +0000 (00:20 +0000)]
am
1595c61d: am
5a49fc33: am
c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit '
1595c61d2f1f081111958b4a22e8fec25402f3cd':
Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Wed, 18 Jun 2014 00:15:35 +0000 (00:15 +0000)]
am
5a49fc33: am
c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit '
5a49fc331ec7d5aa2532d650c32ea68733cbd5c0':
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]
Colin Cross [Tue, 17 Jun 2014 22:53:09 +0000 (22:53 +0000)]
am
15967d0a: am
88b37eda: Merge "Fix reading memory usage for 64-bit processes"
* commit '
15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f':
Fix reading memory usage for 64-bit processes
Colin Cross [Tue, 17 Jun 2014 22:47:50 +0000 (22:47 +0000)]
am
88b37eda: Merge "Fix reading memory usage for 64-bit processes"
* commit '
88b37edaeab7b31cab0f5115e5c9f63a49991408':
Fix reading memory usage for 64-bit processes
Colin Cross [Tue, 17 Jun 2014 22:40:26 +0000 (22:40 +0000)]
Merge "Fix reading memory usage for 64-bit processes"
Colin Cross [Tue, 17 Jun 2014 22:18:07 +0000 (15:18 -0700)]
Fix reading memory usage for 64-bit processes
64-bit process will have virtual addresses that don't fit in an
unsigned long if ActivityManagerService is in a 32-bit process,
and the locations of the '-' and ' ' characters in the maps
are not predictable. Fix the sscanf for finding the start of the
mapping, and use it again to find the end of the mapping. Also
fix a few 64-bit warnings.
Change-Id: I8855c76085142768be1d45346f1032fd37cbe4eb
Robert Ly [Wed, 18 Jun 2014 18:25:32 +0000 (18:25 +0000)]
Merge "docs: add allowembedded" into klp-modular-dev
Robert Ly [Mon, 16 Jun 2014 06:03:01 +0000 (23:03 -0700)]
docs: add allowembedded
Change-Id: I748db66a62c85ad37f900b5bde83be178a1c6902
Jason Sams [Wed, 18 Jun 2014 21:21:29 +0000 (21:21 +0000)]
Merge "Fix element size on 64b"
Jason Sams [Wed, 18 Jun 2014 20:17:57 +0000 (13:17 -0700)]
Fix element size on 64b
RenderScript Element types know their own size. This
change properly tracks the new object sizes.
Change-Id: I3cbf76a7ec5f68056ed5599e9406cea05ba86969
Mark Renouf [Wed, 18 Jun 2014 19:32:06 +0000 (19:32 +0000)]
Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev
OSDN Git Service
