Brian Carlstrom
b85afb38e8
Merge "Make dex2oat heap size product configurable [frameworks/base]"
2014-07-08 22:56:31 +00:00
Deepanshu Gupta
5455ddc48f
Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev
2014-07-08 22:56:18 +00:00
Brian Carlstrom
6d77eb99bf
Make dex2oat heap size product configurable [frameworks/base]
...
Bug: 15919420
Change-Id: I9b7b4f60826fc9b0cc6bb3765ceaa36542425006
2014-07-08 15:05:41 -07:00
Stephen Hines
31012e2cef
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.
2014-07-08 21:29:14 +00:00
Stephen Hines
957ec05ef6
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.
2014-07-08 21:25:19 +00:00
Ricardo Cervera
908d35e79e
am f4d498f1: Merge "docs: Release notes for support lib v20" into klp-modular-dev
...
* commit 'f4d498f17f5abc9297dc5c3eff0858f773828044':
docs: Release notes for support lib v20
2014-07-08 17:36:31 +00:00
Ricardo Cervera
f4d498f17f
Merge "docs: Release notes for support lib v20" into klp-modular-dev
2014-07-08 17:33:57 +00:00
Ricardo Cervera
dc2bba11e0
docs: Release notes for support lib v20
...
Change-Id: I82bbad9ad8945e9437b790e0f47622ef00b318f1
2014-07-08 10:20:37 -07:00
Quddus Chong
1656fb8cc7
am 9a3dd19d: docs: Fixed angle bracket typo for task locking command line instructions. bug: 16153312
...
* commit '9a3dd19df890972a66c2b74ac6e47fc49de5bc2f':
docs: Fixed angle bracket typo for task locking command line instructions. bug: 16153312
2014-07-08 17:16:45 +00:00
Quddus Chong
9a3dd19df8
docs: Fixed angle bracket typo for task locking command line instructions.
...
bug: 16153312
Change-Id: If552028d36878398fe6fd999e711dff321fa9f13
2014-07-08 10:08:50 -07:00
Robert Greenwalt
ca19b7cbdf
am a7efe9b8: am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"
...
* commit 'a7efe9b8743e4a7d8a5b9ef247f6d780f33b4021':
Add Telefonica/Movistar specific APN details for dun
2014-07-08 17:03:36 +00:00
Robert Greenwalt
a7efe9b874
am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"
...
* commit '912700fca8e02fe93fca7d95ef22472f77349ffe':
Add Telefonica/Movistar specific APN details for dun
2014-07-08 16:59:17 +00:00
kmccormick
0ed5a5563d
am 74223986: Doc Update: Add Cloud Save to left nav.
...
* commit '74223986adef1ccee9c29b68c6eaca3e9a5ff1de':
Doc Update: Add Cloud Save to left nav.
2014-07-07 23:23:35 +00:00
Deepanshu Gupta
8e11659a43
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)
2014-07-07 22:52:06 +00:00
kmccormick
74223986ad
Doc Update: Add Cloud Save to left nav.
...
Change-Id: Id87b0ea16231bc70cbd8147ec5252aad251f2363
2014-07-07 14:41:56 -07:00
Craig Mautner
3bc1bafaba
am 6d6d2189: am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."
...
* commit '6d6d2189625a679948920861b957948b505cb53f':
[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
2014-07-07 21:24:41 +00:00
Craig Mautner
6d6d218962
am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."
...
* commit '08881385a86bf887669a555ae03759c374ec9c50':
[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
2014-07-07 21:19:45 +00:00
Ricardo Cervera
b9c27e40ad
am fc55076b: Merge "docs: Minor fix in the Building Your Project with Gradle guide" into klp-modular-dev
...
* commit 'fc55076b5899e67b0666e490bc56034b49a7a042':
docs: Minor fix in the Building Your Project with Gradle guide
2014-07-07 21:16:06 +00:00
Brian Carlstrom
1f8eb4a6b0
am 044492e1: am 52a154fe: Merge "Remove"
...
* commit '044492e1b710c1e604c02b08e0ec97cbb1d5d513':
Remove
2014-07-07 21:00:07 +00:00
Brian Carlstrom
044492e1b7
am 52a154fe: Merge "Remove"
...
* commit '52a154febb7c06b142116235c368417dd5e542ba':
Remove
2014-07-07 20:55:16 +00:00
Robert Greenwalt
912700fca8
Merge "Add Telefonica/Movistar specific APN details for dun"
2014-07-07 19:33:32 +00:00
Albert
b2df39a709
Add Telefonica/Movistar specific APN details for dun
...
Movistar Spain needs to add a specific APN to offer tethering
in their devices.
Change-Id: I5554ff98a5ac4c5f33b9af0083e1fac8305c9e13
Signed-off-by: Albert <alberto.crespell@gmail.com>
2014-07-08 06:56:08 +02:00
Stephen Hines
70a3c55864
Merge "Adds support for multi-input kernels to Frameworks/Base/RS."
2014-07-07 17:50:18 +00:00
Chris Wailes
949610653f
Adds support for multi-input kernels to Frameworks/Base/RS.
...
* Added a new JNI call to pass arrays of Allocations to the RS runtime.
* Added a new version of ForEach that takes an array of Allocations.
* Added some casts to disambiguate existing calls to forEach.
Change-Id: I46d2834c37075b2a2407fd8b010546818a4540d1
2014-07-07 12:27:21 -07:00
Brian Carlstrom
52a154febb
Merge "Remove"
2014-07-07 17:50:18 +00:00
Brian Carlstrom
87f597465c
Remove
...
(cherry picked from commit 9881203920c8445e9a4bdd9e4a90ba0014f34c5e)
Change-Id: Ib40823b7c03af4c71da902b0e5c504e074cf0dd9
2014-07-07 11:31:47 -07:00
Robert Ly
ec5bb62ae7
am d1e3afb5: Merge "docs: update device dashboard for july" into klp-modular-dev
...
* commit 'd1e3afb5be9f983e4dfcbcbaf908261c6454992e':
docs: update device dashboard for july
2014-07-07 17:49:18 +00:00
Robert Ly
36c6803a97
am b50dd5a2: Merge "docs: fix links" into klp-modular-dev
...
* commit 'b50dd5a2f2018056bf3695685562a7e64bde17ad':
docs: fix links
2014-07-07 17:49:14 +00:00
David Friedman
d9843b2ebe
Merge "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html " into klp-modular-dev
2014-07-07 17:47:39 +00:00
Ricardo Cervera
fc55076b58
Merge "docs: Minor fix in the Building Your Project with Gradle guide" into klp-modular-dev
2014-07-07 17:47:39 +00:00
Craig Mautner
9d8a30d9e1
am a7f02a5c: am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."
...
* commit 'a7f02a5cda27147fe7076805187fb6fbc60fdcfb':
[ActivityManager] Avoid keeping restarting home when only home activity exists.
2014-07-07 17:26:20 +00:00
Ricardo Cervera
e5e68d3a5e
docs: Minor fix in the Building Your Project with Gradle guide
...
Change-Id: Ibcb27f4f7cade4a69babd08d7273440a4554e79f
2014-07-07 10:24:47 -07:00
Craig Mautner
a7f02a5cda
am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."
...
* commit 'ef2e76675a6c60a2a4764a2e19fdb2c4d9beb00e':
[ActivityManager] Avoid keeping restarting home when only home activity exists.
2014-07-07 17:23:06 +00:00
Quddus Chong
56d0907024
am af165529: Merge "docs: Fixed url pointing to Google Play Services 5.0 blog post." into klp-modular-dev
...
* commit 'af16552983d3d3015b85b73507d5a060d76a67cd':
docs: Fixed url pointing to Google Play Services 5.0 blog post.
2014-07-07 16:10:13 +00:00
Quddus Chong
96a3f04ac9
am f6438653: Merge "docs: Removed early adopter text from app indexing training doc." into klp-modular-dev
...
* commit 'f6438653e193e5273a76ec910dff929a40871b8e':
docs: Removed early adopter text from app indexing training doc.
2014-07-07 16:10:09 +00:00
Ricardo Cervera
332667a74a
am 409b9ed7: Merge "docs: Added release notes and links for sdk/adt 23.0.2" into klp-modular-dev
...
* commit '409b9ed7b8bee4af2832ccd1c6b76eedf6081a03':
docs: Added release notes and links for sdk/adt 23.0.2
2014-07-07 16:10:04 +00:00
Craig Mautner
0a99270250
am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."
...
* commit '09c1af5d5c43f716fb4093eae6cf5442e7bb88d1':
[ActivityManager] Prevent kill a restarted process again.
2014-07-07 15:41:55 +00:00
Craig Mautner
09c1af5d5c
am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."
...
* commit 'c66da9d606fa3091540bc4c51c2904cc949bf777':
[ActivityManager] Prevent kill a restarted process again.
2014-07-07 15:36:33 +00:00
Craig Mautner
53cc7d7998
am 7611a5d3: am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm."
...
* commit '7611a5d32889f54b1763cf076a442a0575c69b51':
[ActivityManager] Ensure alive process is not killedByAm.
2014-07-07 15:06:41 +00:00
Craig Mautner
7611a5d328
am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm."
...
* commit '5acdd0f67db9b5f41a89dfb5200f37d6f5f984ec':
[ActivityManager] Ensure alive process is not killedByAm.
2014-07-07 15:00:47 +00:00
Narayan Kamath
10eb3b0665
am e0849423: am 501bb0a5: Merge "Fix issue when converting fil->tl."
...
* commit 'e0849423214007d4377638fb42db15276e3ca575':
Fix issue when converting fil->tl.
2014-07-07 10:11:23 +00:00
Narayan Kamath
e084942321
am 501bb0a5: Merge "Fix issue when converting fil->tl."
...
* commit '501bb0a5e4a62a9e58efe2fa0a3f275c193872e7':
Fix issue when converting fil->tl.
2014-07-07 08:57:04 +00:00
Robert Ly
048d1076ae
am 8f0f930d: Merge "Fix incorrect link in Android Wear documentation." into klp-modular-dev
...
* commit '8f0f930d3bf8d74c4680cc94a8def9e3db0989b8':
Fix incorrect link in Android Wear documentation.
2014-07-06 22:31:00 +00:00
Baligh Uddin
b33e23ead7
am abef99cf: (-s ours) am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'abef99cf6a18873ff2079285d26755b41aed979b':
Import translations. DO NOT MERGE
2014-07-06 19:49:37 +00:00
Baligh Uddin
660630f242
am 11281de7: (-s ours) am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '11281de7a2c335ed5410fa83b275173130714f52':
Import translations. DO NOT MERGE
2014-07-06 19:49:33 +00:00
Baligh Uddin
abef99cf6a
am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '02c355d10b3235b73d58ab54222721e32bec3f1f':
Import translations. DO NOT MERGE
2014-07-06 19:45:38 +00:00
Baligh Uddin
11281de7a2
am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '89523569e4c1be2e102b5fb991023d6696384d76':
Import translations. DO NOT MERGE
2014-07-06 19:45:34 +00:00
Baligh Uddin
02c355d10b
am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '59db17673d9d2a5be386e9f324f8f2a7b455d0b1':
Import translations. DO NOT MERGE
2014-07-06 19:42:25 +00:00
Baligh Uddin
89523569e4
am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '314bfe071011cc16d56a9c8bfb65000cd3597bf0':
Import translations. DO NOT MERGE
2014-07-06 19:42:22 +00:00
Baligh Uddin
5ac6a47f25
am de9bfb79: (-s ours) am 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'de9bfb799e99440888ecd911d60f42ff206c886c':
Import translations. DO NOT MERGE
2014-07-06 18:44:06 +00:00