David Friedman
f88aca1d00
am d9843b2e: 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
...
* commit 'd9843b2ebeb9a99b620aae3a3d17ea64fb00358a':
Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html
2014-07-09 00:01:55 +00:00
Deepanshu Gupta
b996a186f1
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]
2014-07-09 00:01:51 +00:00
Deepanshu Gupta
9f595d9897
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]
2014-07-08 23:54:06 +00:00
Deepanshu Gupta
c97f249cdc
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]
2014-07-08 23:50:15 +00:00
Deepanshu Gupta
6077f5f234
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]
2014-07-08 23:50:09 +00:00
Deepanshu Gupta
2e9dc1fe51
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]
2014-07-08 23:45:05 +00:00
Deepanshu Gupta
6dfce3f72c
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]
2014-07-08 23:41:59 +00:00
Deepanshu Gupta
4b84593f8b
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]
2014-07-08 23:39:43 +00:00
Deepanshu Gupta
5c92964e03
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]
2014-07-08 23:38:26 +00:00
Deepanshu Gupta
00a1033408
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]
2014-07-08 23:36:50 +00:00
Deepanshu Gupta
b0470a1fce
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]
2014-07-08 23:35:09 +00:00
Deepanshu Gupta
c295c08fb4
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]
2014-07-08 23:34:08 +00:00
Deepanshu Gupta
4c0f9664de
am 61d3dea6: am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]
...
* commit '61d3dea672ed8f2f4f90860580c37766b0197a58':
Change font family name. [DO NOT MERGE]
2014-07-08 23:33:00 +00:00
Deepanshu Gupta
931e049e65
am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]
...
* commit '5414f83d38455fcd8c788ea1b5cf61aaef3d0a5d':
Change font family name. [DO NOT MERGE]
2014-07-08 23:32:12 +00:00
Deepanshu Gupta
d7ce84528d
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]
2014-07-08 23:30:10 +00:00
Deepanshu Gupta
61d3dea672
am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]
...
* commit '8c8bb83e623e1932853230cb25a3330fcedb73ff':
Change font family name. [DO NOT MERGE]
2014-07-08 23:29:03 +00:00
Deepanshu Gupta
efa0e90cc5
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]
2014-07-08 23:28:41 +00:00
Deepanshu Gupta
5414f83d38
am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]
...
* commit 'd2829b490989b595118c7bd17c1dbff6789cacaa':
Change font family name. [DO NOT MERGE]
2014-07-08 23:28:32 +00:00
Deepanshu Gupta
10e5407334
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]
2014-07-08 23:26:15 +00:00
Deepanshu Gupta
d2829b4909
am 432d16f9: Change font family name. [DO NOT MERGE]
...
* commit '432d16f97adab9d845904e25b50671cf35cfb628':
Change font family name. [DO NOT MERGE]
2014-07-08 23:24:17 +00:00
Deepanshu Gupta
e63b7ad391
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]
2014-07-08 23:24:15 +00:00
Deepanshu Gupta
8c8bb83e62
am 8e11659a: Change font family name. [DO NOT MERGE]
...
* commit '8e11659a43b34d465deb631575425b1706547dcc':
Change font family name. [DO NOT MERGE]
2014-07-08 23:24:05 +00:00
Deepanshu Gupta
ca82da92db
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]
2014-07-08 23:21:34 +00:00
Deepanshu Gupta
5acf782c68
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]
2014-07-08 23:19:46 +00:00
Deepanshu Gupta
5d0db7f2ff
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]
2014-07-08 23:17:22 +00:00
Deepanshu Gupta
d751eed44b
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]
2014-07-08 23:15:39 +00:00
Deepanshu Gupta
432d16f97a
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-08 23:14:36 +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
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