Jeff Brown
7e9ab48ed0
am 5f4e7a10: Merge "Support7Demos: media router sample" into jb-mr2-ub-dev
...
* commit '5f4e7a104b764f07bdc963aa7e668cc3913f85e3':
Support7Demos: media router sample
2013-08-02 17:37:35 -07:00
Jeff Brown
5f4e7a104b
Merge "Support7Demos: media router sample" into jb-mr2-ub-dev
2013-08-02 23:36:17 +00:00
Daniel Olshansky
5bcd87e362
First commit for ListViewCellInsertion.
...
(cherry picked from commit c24035501d )
2013-08-02 21:47:02 +00:00
Alex Ray
a76b0ce27d
Merge "update win sdk whitelist with libutils"
2013-08-02 21:38:33 +00:00
Alan Viverette
cfc35db8c5
Merge "Add sample code for ExploreByTouchHelper class."
2013-08-02 20:32:01 +00:00
Alan Viverette
b468ddad5d
Merge "Remove AccessibilityNodeProvider sample code."
2013-08-02 20:14:24 +00:00
Chong Zhang
036c81a9d2
Support7Demos: media router sample
...
Change-Id: Ie2a6a98cd256caae84f76dd398f9113f07cd4dd3
(cherry picked from commit ba708c7f49 )
2013-08-02 12:46:30 -07:00
Alex Ray
8228c4e025
update win sdk whitelist with libutils
...
Change-Id: I4243eef2e8a251b8ba2397754de938709c57695e
2013-08-02 11:26:03 -07:00
Andrew Hsieh
09073f3d88
Add minimal supports to build multilib x86 toolchain with OpenMP
...
Change-Id: I095c15d2a2de11992890c2a03be0f90332d372de
2013-08-02 17:06:40 +08:00
Andrew Hsieh
aecb5c6d65
Add boostrap lib to build multilib x86 GCC with OpenMP support
...
Build instructions:
cd AOSP=<your-AOSP-path>
cd $AOSP/bionic/libc
ln -s arch-x86 arch-x86_64
export NDK=$AOSP/ndk
cd $NDK
./build/tools/gen-platforms.sh --dst-dir=$NDK --ndk-dir=$NDK --overlay --arch=x86_64
# copy $NDK/platforms/android-9/arch-x86_64/usr/lib, lib64, and libx32 over
Change-Id: I021a34fa139456540bc0afdb1d9636df165f92fe
2013-08-02 14:34:01 +08:00
Chong Zhang
ab020ba010
Merge "Support7Demos: media router sample"
2013-08-02 00:23:39 +00:00
Dianne Hackborn
c7516bca7c
Merge "Add new Intent demos."
2013-08-01 17:01:56 +00:00
Chong Zhang
ba708c7f49
Support7Demos: media router sample
...
Change-Id: Ie2a6a98cd256caae84f76dd398f9113f07cd4dd3
2013-08-01 00:39:41 -07:00
Ying Wang
9ac7637a54
Fix win_sdk build.
...
libutils has been moved to system/core/libs/utils.
Change-Id: Ifd75fd7d5bac8aa24be876860eba030c3b5ae3fb
2013-07-31 20:14:50 -07:00
Stephen Hines
4483ade6b2
Add frameworks/rs and bcc_compat to windows SDK whitelist.
...
Change-Id: I81ff95e98bd827051336709d822f953295269d62
2013-07-31 17:54:37 -07:00
Andrew Hsieh
4d6d0965c2
am 4cea60d3: am 18dc709e: Merge "Fix gles3jni build with clang at android-11"
...
* commit '4cea60d3a9c5fb5aac18288d30ad8851ac031d7f':
Fix gles3jni build with clang at android-11
2013-07-31 17:54:19 -07:00
Andrew Hsieh
4cea60d3a9
am 18dc709e: Merge "Fix gles3jni build with clang at android-11"
...
* commit '18dc709e82337c34c9bf6389bfe9bab357d98477':
Fix gles3jni build with clang at android-11
2013-07-31 17:37:04 -07:00
Andrew Hsieh
18dc709e82
Merge "Fix gles3jni build with clang at android-11"
2013-08-01 00:32:31 +00:00
Dianne Hackborn
b3e4bab48d
Add new Intent demos.
...
Change-Id: Iad47cca8c3fc5ccd184e07e95c9c13877f1d4ff0
2013-07-31 16:38:48 -07:00
Scott Main
16616daef7
am d0ed98de: am e2e6cd77: am 57391f4a: redirect obsolete/orphaned "tab layout" doc to training lesson about tabs
...
* commit 'd0ed98debf580b6c1fde98ba7272b0d3bbd078f0':
redirect obsolete/orphaned "tab layout" doc to training lesson about tabs
2013-07-31 11:11:40 -07:00
Scott Main
050120f695
am 1362a7e1: am f525e1a6: am ccdaba95: add redirect for support library setup
...
* commit '1362a7e1fe15341df55a70d3d2de97dc84bfbaa7':
add redirect for support library setup
2013-07-31 11:11:39 -07:00
Scott Main
d0ed98debf
am e2e6cd77: am 57391f4a: redirect obsolete/orphaned "tab layout" doc to training lesson about tabs
...
* commit 'e2e6cd77b66e5bf8ae5dafba0b98356d80fa2fe6':
redirect obsolete/orphaned "tab layout" doc to training lesson about tabs
2013-07-31 11:07:13 -07:00
Scott Main
1362a7e1fe
am f525e1a6: am ccdaba95: add redirect for support library setup
...
* commit 'f525e1a6d3680a8390eaf557d9f9ef0bfe255ebc':
add redirect for support library setup
2013-07-31 11:07:11 -07:00
Scott Main
e2e6cd77b6
am 57391f4a: redirect obsolete/orphaned "tab layout" doc to training lesson about tabs
...
* commit '57391f4a7cf99b741d7f1e8e59d3a3b31cfde390':
redirect obsolete/orphaned "tab layout" doc to training lesson about tabs
2013-07-31 11:03:03 -07:00
Scott Main
f525e1a6d3
am ccdaba95: add redirect for support library setup
...
* commit 'ccdaba9511ffecebae2dfecb02272b1c4e728006':
add redirect for support library setup
2013-07-31 11:03:01 -07:00
Scott Main
57391f4a7c
redirect obsolete/orphaned "tab layout" doc to training lesson about tabs
...
Change-Id: Ie8c198c53a19b92566a4a5828b33413475a0c3c2
2013-07-31 10:51:20 -07:00
Chris Banes
4bdb5da779
am 4a331512: am fe17cee4: Fix ActionBarUsage in Support7Demos
...
* commit '4a331512cbdeb4b95af4d43e09c8096d68dceedd':
Fix ActionBarUsage in Support7Demos
2013-07-31 06:55:43 -07:00
Chris Banes
4a331512cb
am fe17cee4: Fix ActionBarUsage in Support7Demos
...
* commit 'fe17cee4e41993e3f12685d1dda26f26b7013c12':
Fix ActionBarUsage in Support7Demos
2013-07-31 06:53:25 -07:00
The Android Automerger
79229767a7
merge in klp-release history after reset to master
2013-07-31 06:00:29 -07:00
Andrew Hsieh
80c93fbede
Fix gles3jni build with clang at android-11
...
jni/gl3stub.c:21:5: error: implicit declaration of function 'eglGetProcAddress' is invalid in C99
FIND_PROC(glReadBuffer);
^
jni/gl3stub.c:20:37: note: expanded from macro 'FIND_PROC'
#define FIND_PROC(s) s = (void*)eglGetProcAddress(#s)
^
1 error generated.
Change-Id: I907f33e3d88f3e96bf7958102e90bf15529748b9
2013-07-31 13:27:23 +08:00
Scott Main
ccdaba9511
add redirect for support library setup
...
Change-Id: Ie847a81de6aed6f3448d6a32f223df110886d55a
2013-07-30 17:59:43 -07:00
The Android Automerger
044d47852b
merge in klp-release history after reset to master
2013-07-30 11:08:51 -07:00
Andrew Hsieh
12e0642cd8
am e86297fc: am 445331f5: Merge "Add TCP_INFO state enum values."
...
* commit 'e86297fc2747cee70f4bd903c3c2eb41bb83a407':
Add TCP_INFO state enum values.
2013-07-30 10:28:14 -07:00
Chet Haase
d9654ca88d
Merge "First commit for SlidingFragment."
2013-07-30 17:27:39 +00:00
Chet Haase
d6cb483b3c
Merge "First commit for ListViewDraggingAnimation."
2013-07-30 17:27:30 +00:00
Chet Haase
bc423d38d9
Merge "First commit for CardFlip."
2013-07-30 17:27:19 +00:00
Chet Haase
57a59ccacf
Merge "First commit for ListViewCellInsertion."
2013-07-30 17:27:11 +00:00
Chet Haase
a67b6cd993
Merge "First commit for FoldingLayout."
2013-07-30 17:27:04 +00:00
Chet Haase
2853dbdd74
Merge "First commit for ImagePixelization."
2013-07-30 17:26:53 +00:00
Chet Haase
e81cc552c2
Merge "First commit for ListViewExpandingCells."
2013-07-30 17:25:56 +00:00
Andrew Hsieh
e86297fc27
am 445331f5: Merge "Add TCP_INFO state enum values."
...
* commit '445331f5e1b20c5e9b6017cc1e291c37e6d4c63c':
Add TCP_INFO state enum values.
2013-07-29 20:26:05 -07:00
Andrew Hsieh
445331f5e1
Merge "Add TCP_INFO state enum values."
2013-07-30 03:19:29 +00:00
Andrew Hsieh
65675341ac
Add TCP_INFO state enum values.
...
See b.android.com/38881 and fix in bionic
0dff43cab41e4a0bd5bd018584952c68cb224977
Change-Id: I2417fe3cf43919bf363f36c337ea6813f13699d8
2013-07-29 20:15:57 -07:00
Andrew Hsieh
de21cf4885
am 37684af0: am 7a85c344: Merge "Update x86 crtfiles from bionic with C versions"
...
* commit '37684af0c00a06406403a8076ffad34a7632f3fc':
Update x86 crtfiles from bionic with C versions
2013-07-29 17:51:15 -07:00
Andrew Hsieh
37684af0c0
am 7a85c344: Merge "Update x86 crtfiles from bionic with C versions"
...
* commit '7a85c344ff0468dbd7d78563a1ab668d2d184305':
Update x86 crtfiles from bionic with C versions
2013-07-29 17:48:56 -07:00
Andrew Hsieh
7a85c344ff
Merge "Update x86 crtfiles from bionic with C versions"
2013-07-30 00:43:58 +00:00
Daniel Olshansky
8cfd63c979
First commit for ListViewExpandingCells.
...
Change-Id: I8d64562f8c7c0e207aef0b36df10ee3744dd446a
2013-07-29 15:07:05 -07:00
Daniel Olshansky
4ea559806d
First commit for ImagePixelization.
...
Change-Id: I02ab79d17cb32773a9bd1a4c50bc76bde8925368
2013-07-29 15:02:28 -07:00
Daniel Olshansky
425e318026
First commit for FoldingLayout.
...
Change-Id: I3eaca79e3c7a0c6d2e8f5c6de5a3d4c3db4bf5a5
2013-07-29 14:58:49 -07:00
Daniel Olshansky
c24035501d
First commit for ListViewCellInsertion.
2013-07-29 11:05:36 -07:00