Trevor Johns
4ffdba0e4f
am af0ab077: Remove samples/legacy from sdk.atree
...
* commit 'af0ab077f336b45b1d099941d93c1c0737d4967b':
Remove samples/legacy from sdk.atree
2013-07-24 16:19:51 -07:00
Trevor Johns
ba27e57c3c
am 1ffb3507: Add new sample tree to SDK build
...
* commit '1ffb35074a304a94d343c21f8d1713396d0efe80':
Add new sample tree to SDK build
2013-07-24 16:19:50 -07:00
Trevor Johns
2a4aa3cd5d
Remove AppRestrictions and BluetoothLeGatt samples
...
These have been moved to the new samples repository in
developers/samples/android.
Change-Id: I77312ea146ccb47ec8ecf38c9448149ec4c34962
2013-07-24 12:36:28 -07:00
Trevor Johns
da67d18b5b
Add common directory to BasicSyncAdapter sample
...
This directory will be automatically copied over using a
templating system in the future, but for now it needs to
be copied in using sdk.atree.
This also allows us to remove the symlink that was checked
in previously, and which likely won't work on Windows.
Change-Id: If3d78eec7c1b845d1ae1caca59099d3284bdf73a
2013-07-24 12:31:16 -07:00
The Android Automerger
44a366a3b5
merge in klp-release history after reset to master
2013-07-24 06:01:04 -07:00
Joe Fernandez
f8a92396ba
Merge "docs: Redirect Support Library page to new location" into jb-mr2-dev
2013-07-24 06:14:57 +00:00
Joe Fernandez
0178565349
docs: Redirect Support Library page to new location
...
Change-Id: I49b3a7ed9e7c9499ca76e3d50ca02454ac5846cb
2013-07-23 21:52:49 -07:00
Raphael Moll
cea9fb7b4a
Add bcc_compat to Windows whitelist.
...
Change-Id: I2b877d9fba8b0dc258a4dfd282bff0d21b77af0f
(cherry picked from commit 2fdc05f83e )
2013-07-23 23:53:05 +00:00
Trevor Johns
af0ab077f3
Remove samples/legacy from sdk.atree
...
This directory is only on my local machine, and doesn't
really exist. :)
Change-Id: Iea29b3f06fd089a5dca0f990cca058d9c2e7179b
2013-07-23 16:03:08 -07:00
Trevor Johns
1ffb35074a
Add new sample tree to SDK build
...
Old samples will live in samples/${PLATFORM_NAME}/legacy.
New samples are sorted by category, and come from
developers/samples/android.
Change-Id: I573ba4f58d701eac4896ae795d041cae4b9a9794
2013-07-23 15:54:23 -07:00
Igor Murashkin
dda1626d9e
Merge "eclipse classpath: Add TestingCamera2"
2013-07-23 21:25:02 +00:00
Xavier Ducrohet
f2ef42fcea
am 513a888d: am b7ed7bec: Add support-v4 to the appcompat lib.
...
* commit '513a888dfab9589381f25c547fd5f01f1afaf071':
Add support-v4 to the appcompat lib.
2013-07-23 12:44:28 -07:00
Xavier Ducrohet
513a888dfa
am b7ed7bec: Add support-v4 to the appcompat lib.
...
* commit 'b7ed7bec1f3276dde7c4e3771dc59a844540d47e':
Add support-v4 to the appcompat lib.
2013-07-23 12:42:14 -07:00
Xavier Ducrohet
b7ed7bec1f
Add support-v4 to the appcompat lib.
...
Change-Id: I2676ca4705e5dca15388e3759ba3a644fbae2b9b
2013-07-23 12:31:50 -07:00
The Android Automerger
720e643d76
merge in klp-release history after reset to master
2013-07-23 06:00:27 -07:00
Raphael Moll
930bcded66
Merge "Add bcc_compat to Windows whitelist."
2013-07-22 22:14:40 +00:00
Siva Velusamy
a9009a0c2f
am 83620297: am 31cc1650: Merge "Release systrace into platform-tools" into jb-mr2-dev
...
* commit '836202974fdabd16d94c4b7589721267bca6b58d':
Release systrace into platform-tools
2013-07-22 14:00:28 -07:00
Siva Velusamy
836202974f
am 31cc1650: Merge "Release systrace into platform-tools" into jb-mr2-dev
...
* commit '31cc1650cf4509d0b5e4c236f28b2e7620104e42':
Release systrace into platform-tools
2013-07-22 13:58:17 -07:00
Siva Velusamy
31cc1650cf
Merge "Release systrace into platform-tools" into jb-mr2-dev
2013-07-22 20:53:51 +00:00
Raphael Moll
2fdc05f83e
Add bcc_compat to Windows whitelist.
...
Change-Id: I2b877d9fba8b0dc258a4dfd282bff0d21b77af0f
2013-07-22 12:45:59 -07:00
Andrew Hsieh
032d7bf04b
am 293c746b: am f05c9f97: am 85f9f764: Merge "Workaround for libportable wait4 implementation."
...
* commit '293c746bdc3158fcc6221ec6a33aedfca2d07cb6':
Workaround for libportable wait4 implementation.
2013-07-22 12:20:00 -07:00
Andrew Hsieh
293c746bdc
am f05c9f97: am 85f9f764: Merge "Workaround for libportable wait4 implementation."
...
* commit 'f05c9f97b39d4d17658577416dcc16d85c7582db':
Workaround for libportable wait4 implementation.
2013-07-22 12:17:45 -07:00
Andrew Hsieh
f05c9f97b3
am 85f9f764: Merge "Workaround for libportable wait4 implementation."
...
* commit '85f9f764507761e011fc14398e7ddf08b5d383c5':
Workaround for libportable wait4 implementation.
2013-07-22 12:14:00 -07:00
Andrew Hsieh
85f9f76450
Merge "Workaround for libportable wait4 implementation."
2013-07-22 19:11:18 +00:00
Fred Chung
b6cd736ce9
am 8905657e: am 19dd9d20: Merge "Removed redundant launcher icon reference." into jb-mr2-dev
...
* commit '8905657ea4b25ac6ee2820f79d6d9ed90aa2122e':
Removed redundant launcher icon reference.
2013-07-22 11:45:32 -07:00
Fred Chung
8905657ea4
am 19dd9d20: Merge "Removed redundant launcher icon reference." into jb-mr2-dev
...
* commit '19dd9d200cc6783b468c4392a724dc1dd1f15523':
Removed redundant launcher icon reference.
2013-07-22 11:42:41 -07:00
Fred Chung
19dd9d200c
Merge "Removed redundant launcher icon reference." into jb-mr2-dev
2013-07-22 18:37:53 +00:00
Fred Chung
581b9fdfb1
am 9aa3da19: am 63bc4aaf: Merge "App restriction for restricted profile sample." into jb-mr2-dev
...
* commit '9aa3da19b5d0172e50d857ea3c640a64daf4b056':
App restriction for restricted profile sample.
2013-07-22 11:33:48 -07:00
Fred Chung
6758cf0530
Removed redundant launcher icon reference.
...
Change-Id: I637736a97744db79e803e1fba4b5c0bd993e4e53
2013-07-22 11:33:02 -07:00
Fred Chung
9aa3da19b5
am 63bc4aaf: Merge "App restriction for restricted profile sample." into jb-mr2-dev
...
* commit '63bc4aaf4cef9e82fd6554f6a06f64815b809c6e':
App restriction for restricted profile sample.
2013-07-22 11:32:00 -07:00
Fred Chung
63bc4aaf4c
Merge "App restriction for restricted profile sample." into jb-mr2-dev
2013-07-22 18:25:54 +00:00
Andrew Hsieh
3ae3903b32
am 615bd1f4: am 54009f7e: am 5d774594: Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions."
...
* commit '615bd1f449158db3198fd27e6b53b0cf42ae6891':
ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
2013-07-22 09:34:46 -07:00
Andrew Hsieh
615bd1f449
am 54009f7e: am 5d774594: Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions."
...
* commit '54009f7e95e2f9fffbcc771b4495a72045c5f381':
ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
2013-07-22 09:32:32 -07:00
Andrew Hsieh
54009f7e95
am 5d774594: Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions."
...
* commit '5d7745946dfc76dc2c82ef4ff097dedd8913e393':
ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
2013-07-22 09:30:19 -07:00
Andrew Hsieh
5d7745946d
Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions."
2013-07-22 16:28:08 +00:00
The Android Automerger
5296de3b22
merge in klp-release history after reset to master
2013-07-22 06:00:44 -07:00
Fred Chung
b71371d3af
App restriction for restricted profile sample.
...
This sample demonstrates how to expose restrictions for a restricted user on a multiuser device. This feature is available on Android 4.3 (API level 18) and above platforms.
Change-Id: I4ef1bbda8e530dd8370d754de814fce96eaae1f1
2013-07-21 23:19:18 -07:00
Dmitry Shmidt
e948041d54
Merge "Connectivity: Add IP config to TDLS test"
2013-07-19 23:27:15 +00:00
Dirk Dougherty
b909ea3141
am b4cddf93: am c821270d: am 80f50242: am d06f4e32: am 6ac22572: Update appengine server to handle \'@\'.
...
* commit 'b4cddf93e355b15db33dc6bf7d36ffbe3541cb1d':
Update appengine server to handle '@'.
2013-07-19 16:02:13 -07:00
David 'Digit' Turner
fe8625d401
ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
...
This fixes WCHAR_MIN / WCHAR_MAX to be signed / unsigned based on
the target ABI.
This only impacts ARM where wchar_t is really 'unsigned int'.
One can define _WCHAR_IS_ALWAYS_SIGNED to restore the old behaviour.
See http://b.android.com/55749
Change-Id: Idb63b7b11aecd3cfee37f5b6dd2eba78b308876f
2013-07-20 00:56:53 +02:00
Dmitry Shmidt
81253bc376
Connectivity: Add IP config to TDLS test
...
Change-Id: I70096a042faaacdaeed7d6aae16a95704202ef1d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com >
2013-07-19 15:55:35 -07:00
Siva Velusamy
28f992a9cd
Release systrace into platform-tools
...
Change-Id: Id05c92f96ecb38c5a056d51ba86ea2e91a45733d
2013-07-19 15:05:24 -07:00
Dirk Dougherty
b4cddf93e3
am c821270d: am 80f50242: am d06f4e32: am 6ac22572: Update appengine server to handle \'@\'.
...
* commit 'c821270d716ca73a998ece17c9d5bf593bdf590e':
Update appengine server to handle '@'.
2013-07-19 13:43:05 -07:00
Jeff Brown
e0540e6c50
Merge "Update paths to framework intermediates."
2013-07-19 19:35:14 +00:00
Igor Murashkin
eae9330f7b
eclipse classpath: Add TestingCamera2
...
Change-Id: Iee650dd2b76ab958c6ff536a0e72038305709344
2013-07-18 17:33:10 -07:00
Dmitry Shmidt
4a5e169b68
Merge "Connectivity: Add TDLS test"
2013-07-19 00:07:04 +00:00
Dmitry Shmidt
47a5a18431
Connectivity: Add TDLS test
...
Bug: 8539031
Change-Id: I68e9e2e93d49f29ed915a462570cb8e782e9a4f2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com >
2013-07-18 16:32:30 -07:00
Jeff Brown
b32b92da3d
Update paths to framework intermediates.
...
Change-Id: Ic9e54cd14234ee1b03d1fd98b479fc191af10830
2013-07-18 16:30:39 -07:00
Santos Cordon
dccbd08f7a
Merge "Adding InCallUI and Telephony service directories to classpath."
2013-07-18 17:41:11 +00:00
Dirk Dougherty
c821270d71
am 80f50242: am d06f4e32: am 6ac22572: Update appengine server to handle \'@\'.
...
* commit '80f50242895afb4b43b231af5e78fcc8c5004206':
Update appengine server to handle '@'.
2013-07-17 10:24:47 -07:00