Deepanshu Gupta
c0e290d39f
am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'a5d913ab3789e552bdfcc0a2a6b9fb87d6f1b0ca':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:09:00 +00:00
Deepanshu Gupta
19e61e5f52
am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'a5d913ab3789e552bdfcc0a2a6b9fb87d6f1b0ca':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:08:45 +00:00
Deepanshu Gupta
a5d913ab37
Add ICU jar to SDK [DO NOT MERGE]
...
Bundle the ICU jar with the SDK.
Change-Id: I0773cee58b072f3bf60c2594b6dee251ef101cf0
(cherry picked from commit 79cc4f9212 )
2014-05-02 11:59:11 -07:00
Vince Harron
e8ab84bbfb
am ab7ab626: am caa62895: am 611cfde5: Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
...
* commit 'ab7ab6260d509387db93f88b505c1976a7e0b5ad':
Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
2014-05-01 17:56:36 +00:00
Vince Harron
ab7ab6260d
am caa62895: am 611cfde5: Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
...
* commit 'caa62895daa96952010e0a610ebb334042dc0f0f':
Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
2014-05-01 17:51:15 +00:00
Vince Harron
caa62895da
am 611cfde5: Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
...
* commit '611cfde5c024add8345c4dd8cc9ab41b1f363905':
Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
2014-05-01 17:47:15 +00:00
Andrew Hsieh
1b10ec4818
am fc30ef32: am 4d8f4793: am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN"
...
* commit 'fc30ef32c781970fc05b3753152cee459c51ce0e':
Track transition from SIGRTMIN to __SIGRTMIN
2014-05-01 01:28:41 +00:00
Andrew Hsieh
fc30ef32c7
am 4d8f4793: am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN"
...
* commit '4d8f4793cdc9804e582805a22cfcd94343f8d9cc':
Track transition from SIGRTMIN to __SIGRTMIN
2014-05-01 01:24:57 +00:00
Andrew Hsieh
4d8f4793cd
am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN"
...
* commit '261d178e55db870331bd5eb8a41a22aa8f6c3589':
Track transition from SIGRTMIN to __SIGRTMIN
2014-05-01 01:22:48 +00:00
Andrew Hsieh
261d178e55
Merge "Track transition from SIGRTMIN to __SIGRTMIN"
2014-05-01 01:20:04 +00:00
Brian Carlstrom
fb9c4e0c9f
Track transition from SIGRTMIN to __SIGRTMIN
...
Change-Id: I69064edf1a7e95c91f90d9b05c1cf3f9c8c46747
2014-04-30 17:58:41 -07:00
Dave Platt
1dd16c67e9
Merge "Update sample NSD app to work reliably with current Android"
2014-04-30 23:39:27 +00:00
Tim Kilbourn
d810db8136
Merge "Set row heights for browse rows."
2014-04-30 19:23:06 +00:00
Chiao Cheng
e2962681b6
Merge "Overhaul of intellij-gen script."
2014-04-30 18:07:29 +00:00
Tim Kilbourn
6044578753
Set row heights for browse rows.
...
Set a size on the text_bg so the cards appear at the correct size.
Change-Id: Ic2a836431485aaaea922a6bb3868e3e937f1ec21
2014-04-30 09:42:26 -07:00
Bill Yi
9dc9ca97a5
am b5255dab: am 23f68632: Merge commit \'d297be2136209cab4edbcf8879520f65fb564103\' into HEAD
...
* commit 'b5255dabc0131f907c607a79f08c8bc9ea92551f':
2014-04-30 00:53:04 +00:00
Bill Yi
b5255dabc0
am 23f68632: Merge commit \'d297be2136209cab4edbcf8879520f65fb564103\' into HEAD
...
* commit '23f68632c7f1a368bcc471b9b782f29fb32619ca':
2014-04-30 00:49:29 +00:00
George Mount
69ac8ef1c4
Add new sample transition XML.
...
Change-Id: Iab0dc6f1533a2d841ff3edbda24535ba17184c7c
2014-04-29 13:46:56 -07:00
Bill Yi
23f68632c7
Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD
2014-04-29 11:33:09 -07:00
Tim Kilbourn
04c85ceee7
Minor card tweaks for leanback demo.
...
- Set card size to 160x100
- Show 10 rows
Change-Id: I440eef119250d3385ce5d367ec231bfe7c0201b4
2014-04-28 15:23:48 -07:00
Andrew Hsieh
be0a44eaf7
am cb606e1f: am 88765fac: am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan"
...
* commit 'cb606e1fe286507f17d35373e6b8cb295c27eeee':
Bump __clang_minor__ check to 6 for __builtin_isnan
2014-04-28 17:11:12 +00:00
Andrew Hsieh
cb606e1fe2
am 88765fac: am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan"
...
* commit '88765facf16ad4887bf6a1c91c64839ecda9d081':
Bump __clang_minor__ check to 6 for __builtin_isnan
2014-04-28 17:05:58 +00:00
Andrew Hsieh
88765facf1
am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan"
...
* commit 'e23f9c5d308c0499c442cbd0bb07d336471dcb88':
Bump __clang_minor__ check to 6 for __builtin_isnan
2014-04-28 17:02:31 +00:00
Andrew Hsieh
e23f9c5d30
Merge "Bump __clang_minor__ check to 6 for __builtin_isnan"
2014-04-28 16:59:32 +00:00
Jim Miller
44e89d3e2f
Merge "Add test harness for new keyguard features: - disable all notifications on secure keyguard - disable unredacted notifications on secure keyguard - disable TrustAgents"
2014-04-26 00:32:32 +00:00
Jim Miller
1d8e0796c5
Add test harness for new keyguard features:
...
- disable all notifications on secure keyguard
- disable unredacted notifications on secure keyguard
- disable TrustAgents
Change-Id: I864a103263996dcd491ff77f744bff8398af9cc8
2014-04-25 15:28:28 -07:00
Andrew Hsieh
5999e41aa2
am b7375594: am 36e2bc95: am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64"
...
* commit 'b73755948be7081e1e01276f21e9c589a7d24a6d':
Update arch-x86/lib-bootstrap/lib64
2014-04-25 17:02:14 +00:00
Andrew Hsieh
b73755948b
am 36e2bc95: am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64"
...
* commit '36e2bc959feb77b875761710cb8a3a1f43882703':
Update arch-x86/lib-bootstrap/lib64
2014-04-25 16:58:59 +00:00
Andrew Hsieh
36e2bc959f
am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64"
...
* commit '90dada064c8fb05b91889cb7978b7ebe335f7cbb':
Update arch-x86/lib-bootstrap/lib64
2014-04-25 16:55:57 +00:00
Andrew Hsieh
b280e72a97
Bump __clang_minor__ check to 6 for __builtin_isnan
...
It appears that upstream 3.5 still can't accept __builtin_isnan redeclared
with calling convention, eg.
cat > isnan.c <<EOF
int __builtin_isnan(double) __attribute__((pcs("aapcs")));
EOF
clang -target armv5te-none-linux-androideabi -c isnan.c
isnan.c:1:5: error: function declared 'aapcs' here was previously declared without calling convention
int __builtin_isnan(double) __attribute__((pcs("aapcs")));
^
isnan.c:1:5: note: previous declaration is here
Change-Id: Iff466fd913c3deec27aa3ff355a208543028d368
2014-04-25 09:55:31 -07:00
Andrew Hsieh
90dada064c
Merge "Update arch-x86/lib-bootstrap/lib64"
2014-04-25 16:51:49 +00:00
Dongwon Kang
0bcf62a1e8
Merge "Add sample ATSC TvInputService app."
2014-04-25 10:21:05 +00:00
Andrew Hsieh
fec8b6eb28
Update arch-x86/lib-bootstrap/lib64
...
Note that this is only used (symlinked) by android-20/arch-x86/lib-bootstrap
for x86_64 build
Change-Id: I9ab023b0383f406fd5b05debf2dd75ea9f2243d8
2014-04-24 12:26:29 -07:00
Andrew Hsieh
693f2b6904
am a589c985: am 36037576: am 867634ec: Merge "Update libportable to catch up bionic changes."
...
* commit 'a589c985e9d6cfad4c938004442bc032ef68cee6':
Update libportable to catch up bionic changes.
2014-04-24 15:43:20 +00:00
Andrew Hsieh
a589c985e9
am 36037576: am 867634ec: Merge "Update libportable to catch up bionic changes."
...
* commit '36037576fcfe5de9d8862812bd37b5a5cfcd6957':
Update libportable to catch up bionic changes.
2014-04-24 09:02:45 +00:00
Andrew Hsieh
36037576fc
am 867634ec: Merge "Update libportable to catch up bionic changes."
...
* commit '867634ecf44a88e407f6080859b1ca12d159eb63':
Update libportable to catch up bionic changes.
2014-04-24 03:07:34 +00:00
Andrew Hsieh
867634ecf4
Merge "Update libportable to catch up bionic changes."
2014-04-24 03:05:22 +00:00
Brett Chabot
2e17ac46c8
Merge "Temporarily turn off runtest's disabling of dalvik verifier"
2014-04-23 22:32:54 +00:00
WenHan Gu
70174f1084
Update libportable to catch up bionic changes.
...
Note __open should not be used anymore.
Also, fix a x86 fenv bug.
Change-Id: I8430ccfdb7d7685e1ee6e71333d65590c09e3d6c
2014-04-23 21:47:49 +08:00
Jeff Sharkey
4c4580e5f6
Add code to exercise DocumentsContract.
...
Also fix broken "atLeastKitKat" definition.
Change-Id: I7c82ebb7b230ac66da3194412c845ff0c2b72f85
2014-04-22 22:03:37 -07:00
Baligh Uddin
ca5371cdd7
am b287fd3b: (-s ours) am 96a440d5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit 'b287fd3b83a59fa881ee05743305685635ffdd67':
Import translations. DO NOT MERGE
2014-04-23 02:20:21 +00:00
Baligh Uddin
1ccbf667c0
am 183a43a4: (-s ours) am 797d8dc9: (-s ours) Import translations. DO NOT MERGE
...
* commit '183a43a4b6ce831793e0c05b2fc09b7c138e2331':
Import translations. DO NOT MERGE
2014-04-23 02:20:20 +00:00
Baligh Uddin
b287fd3b83
am 96a440d5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '96a440d50c3555ae400ef398b66db6acbe1f8ce6':
Import translations. DO NOT MERGE
2014-04-23 02:13:38 +00:00
Baligh Uddin
183a43a4b6
am 797d8dc9: (-s ours) Import translations. DO NOT MERGE
...
* commit '797d8dc982a93445d8ace244e17e187eedb62aeb':
Import translations. DO NOT MERGE
2014-04-23 02:13:37 +00:00
Baligh Uddin
96a440d50c
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-04-23 02:08:29 +00:00
Baligh Uddin
797d8dc982
Import translations. DO NOT MERGE
...
Change-Id: Ia6d8c517d50580b1de880027464b0ebb5a91a6ba
Auto-generated-cl: translation import
2014-04-22 17:50:52 -07:00
Baligh Uddin
70c67d7fc2
Import translations. DO NOT MERGE
...
Change-Id: Icff6e310b5f042a43580712902e6357be482c20f
Auto-generated-cl: translation import
2014-04-22 17:46:05 -07:00
Brett Chabot
8b538bd847
Temporarily turn off runtest's disabling of dalvik verifier
...
Bug: 14088982
Change-Id: Iad2610fde7c9bd7c52a25fc1a1f5cddff6bc43e4
2014-04-22 11:46:00 -07:00
Andrew Hsieh
a2bbba8a6e
am 2e1fab99: am 45db7066: am 19dc3c64: Merge "Add android-20 bionic headers/symbols for 32-bit"
...
* commit '2e1fab998fcb3de9e1fa5022b929e7a3d1458fbd':
Add android-20 bionic headers/symbols for 32-bit
2014-04-22 14:48:49 +00:00
Andrew Hsieh
2e1fab998f
am 45db7066: am 19dc3c64: Merge "Add android-20 bionic headers/symbols for 32-bit"
...
* commit '45db706612a009a4da15ab611e9dd4ee518495a6':
Add android-20 bionic headers/symbols for 32-bit
2014-04-22 14:46:33 +00:00