Ben Cheng
4a09318c1e
Merge "Temporarily disable elftree on darwin-x86"
2013-11-23 01:15:49 +00:00
Ben Cheng
4a7c39c97b
Temporarily disable elftree on darwin-x86
...
Change-Id: Ib4a73283ad18088de33da3c00278aae67c485fac
2013-11-22 17:02:53 -08:00
The Android Open Source Project
c61dbe23a4
Merge commit '8eccbd3b5d90b9f0557c9a01f49d45e98ac85a46' into HEAD
2013-11-22 16:46:47 -08:00
Kenny Root
5cd6376aed
am a163fa90: am 7e0d5c29: am c9421a7a: Merge "make_key: add EC key generation support"
...
* commit 'a163fa900395cf8ebc1bbd143becc6bf2433781d':
make_key: add EC key generation support
2013-11-22 10:49:30 -08:00
Kenny Root
a163fa9003
am 7e0d5c29: am c9421a7a: Merge "make_key: add EC key generation support"
...
* commit '7e0d5c29b33f3056aedcb44cb8cbae808c11c35d':
make_key: add EC key generation support
2013-11-22 10:43:34 -08:00
Kenny Root
7e0d5c29b3
am c9421a7a: Merge "make_key: add EC key generation support"
...
* commit 'c9421a7ac67b6613acfb1415964947afb4c0fa30':
make_key: add EC key generation support
2013-11-22 10:40:39 -08:00
Kenny Root
c9421a7ac6
Merge "make_key: add EC key generation support"
2013-11-22 18:37:38 +00:00
Alexander Lucas
5a0ab97113
am b40c1571: am 3a85c6d5: am 98a13468: Updating samples browser to include ActionBarCompat samples
...
* commit 'b40c1571dc9ecf016f6b3bdba26ab54e0941ad43':
Updating samples browser to include ActionBarCompat samples
2013-11-22 10:10:14 -08:00
Alexander Lucas
b40c1571dc
am 3a85c6d5: am 98a13468: Updating samples browser to include ActionBarCompat samples
...
* commit '3a85c6d598f8575a1442278bf3733eec6c5d6a2e':
Updating samples browser to include ActionBarCompat samples
2013-11-22 10:06:20 -08:00
Alexander Lucas
3a85c6d598
am 98a13468: Updating samples browser to include ActionBarCompat samples
...
* commit '98a13468a649288ff83fd26a80c5922cede6ec1a':
Updating samples browser to include ActionBarCompat samples
2013-11-22 18:03:49 +00:00
Ben Cheng
ad593476a8
am 23604216: am 45d19989: am 4b60b014: Merge "Switch to use elfutils 0.153"
...
* commit '236042169e83cf4cf1a1bcc28cc71cd0c3744aef':
Switch to use elfutils 0.153
2013-11-21 23:00:08 -08:00
Andrew Hsieh
79b016614d
am 6763bf82: am 3053834f: am c044b5e3: Merge "- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6"
...
* commit '6763bf82d455d9a9c460457ff9588111ebc0721a':
- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6
2013-11-21 22:59:43 -08:00
Elliott Hughes
5bb6cf6e07
am 03e0781e: am f067a933: am 1f1e7379: Merge "MIPS hasn\'t supported SA_RESTORER since 2.5 kernels."
...
* commit '03e0781ececec98d6cd1a61ab78af70479f626bc':
MIPS hasn't supported SA_RESTORER since 2.5 kernels.
2013-11-21 22:59:42 -08:00
Ben Cheng
236042169e
am 45d19989: am 4b60b014: Merge "Switch to use elfutils 0.153"
...
* commit '45d1998989aab744df954a0357cf1eed7d2123b1':
Switch to use elfutils 0.153
2013-11-21 18:44:07 -08:00
Andrew Hsieh
6763bf82d4
am 3053834f: am c044b5e3: Merge "- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6"
...
* commit '3053834fdc4159afb8b276eec4fecdb7e97cf87c':
- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6
2013-11-21 17:15:12 -08:00
Elliott Hughes
03e0781ece
am f067a933: am 1f1e7379: Merge "MIPS hasn\'t supported SA_RESTORER since 2.5 kernels."
...
* commit 'f067a933f5222939711328a127fcf007cf9032c7':
MIPS hasn't supported SA_RESTORER since 2.5 kernels.
2013-11-21 17:15:02 -08:00
Ben Cheng
45d1998989
am 4b60b014: Merge "Switch to use elfutils 0.153"
...
* commit '4b60b0143dd26498a13efa4e8b1851b71e8581e0':
Switch to use elfutils 0.153
2013-11-21 16:48:11 -08:00
Ben Cheng
4b60b0143d
Merge "Switch to use elfutils 0.153"
2013-11-22 00:45:17 +00:00
Ben Cheng
75c68c9c53
Switch to use elfutils 0.153
...
Change-Id: Ie6ee5911949f6d32f39f1f8800ddf41550dedd95
2013-11-21 16:36:27 -08:00
Alexander Lucas
98a13468a6
Updating samples browser to include ActionBarCompat samples
...
Change-Id: I4bf39042db2bfef3ed538280f6fc533a7a379882
2013-11-21 15:45:13 -08:00
Alexander Lucas
a4571dc351
am 607b0da6: am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples
...
* commit '607b0da6372cc033eb52684fbfd425c2298984b2':
Updating sdk.atree to reflect new set of samples
2013-11-21 14:34:42 -08:00
Alexander Lucas
607b0da637
am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples
...
* commit 'f044ac485dd60ac075b31f81db3922b2d3780119':
Updating sdk.atree to reflect new set of samples
2013-11-21 14:30:44 -08:00
Alexander Lucas
f044ac485d
am b734f1b5: Updating sdk.atree to reflect new set of samples
...
* commit 'b734f1b5905c0f49e2dd8d73333ac5b003e15fa9':
Updating sdk.atree to reflect new set of samples
2013-11-21 14:26:53 -08:00
Alexander Lucas
b734f1b590
Updating sdk.atree to reflect new set of samples
...
Change-Id: I1308d65f77783fc7f43fdc36bf90a59a137ec73f
2013-11-21 13:32:25 -08:00
Andrew Hsieh
3053834fdc
am c044b5e3: Merge "- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6"
...
* commit 'c044b5e3673ed685693b3b381cebc4688e219334':
- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6
2013-11-21 00:11:20 -08:00
Andrew Hsieh
c044b5e367
Merge "- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6"
2013-11-21 08:08:22 +00:00
Hak Matsuda
cc69f210a7
- Using hard-fp
...
- Immersive mode in android-19
- Fixed local reference release in JNI helper
- Misc fixes
Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6
2013-11-21 16:06:02 +08:00
Elliott Hughes
f067a933f5
am 1f1e7379: Merge "MIPS hasn\'t supported SA_RESTORER since 2.5 kernels."
...
* commit '1f1e7379078e898dc21f4f52dc5bb46e19e03ce5':
MIPS hasn't supported SA_RESTORER since 2.5 kernels.
2013-11-20 16:09:39 -08:00
Elliott Hughes
1f1e737907
Merge "MIPS hasn't supported SA_RESTORER since 2.5 kernels."
2013-11-21 00:07:49 +00:00
Tor Norbye
9eb0faeae8
am d5f35e29: am 02ab4c2b: am dff82828: Update api-versions.xml for latest API changes
...
* commit 'd5f35e29eb2d488652ecc42ea9f79e87484f3305':
Update api-versions.xml for latest API changes
2013-11-20 14:54:45 -08:00
Tor Norbye
d5f35e29eb
am 02ab4c2b: am dff82828: Update api-versions.xml for latest API changes
...
* commit '02ab4c2bcb9810c760759ad2fa81284688e7c0d3':
Update api-versions.xml for latest API changes
2013-11-20 14:50:30 -08:00
Tor Norbye
02ab4c2bcb
am dff82828: Update api-versions.xml for latest API changes
...
* commit 'dff8282839de40f210d802556194665be79750d1':
Update api-versions.xml for latest API changes
2013-11-20 14:46:01 -08:00
Tor Norbye
dff8282839
Update api-versions.xml for latest API changes
...
Change-Id: Id979db34a83da704df38c1250fb946baf928650b
2013-11-20 14:41:01 -08:00
Elliott Hughes
dfb6545c6b
MIPS hasn't supported SA_RESTORER since 2.5 kernels.
...
Change-Id: Ia3500168ab5ba5ba381d0195e9ecc26a618bf505
2013-11-20 11:34:53 -08:00
Mindy Pereira
8ca83ba6d3
am 279ed15a: am fd2db1be: Merge "Swiperefresh sample" into klp-ub-dev
...
* commit '279ed15a7f654e358ff572538c160fe7f896be42':
Swiperefresh sample
2013-11-19 17:28:24 -08:00
Mindy Pereira
279ed15a7f
am fd2db1be: Merge "Swiperefresh sample" into klp-ub-dev
...
* commit 'fd2db1bef161e8bc7eda014f3924009330a9ab44':
Swiperefresh sample
2013-11-19 17:26:01 -08:00
Mindy Pereira
fd2db1bef1
Merge "Swiperefresh sample" into klp-ub-dev
2013-11-20 01:23:57 +00:00
Mindy Pereira
18152c7cea
Swiperefresh sample
...
Change-Id: Ifc5736c91e61b592a010bd212752347e141849cc
2013-11-19 17:14:06 -08:00
Raphael Moll
e3d7035cd5
Prepare SDK for KLP MR1. Do not merge.
...
System images are in 19 rev 2 for MR1 (since they have minor.major)
platform-tools: update the API diff file that lint uses (not automated yet.)
build-tools: llvm-rs-cc issue affecting RS NDK mode in Gradle.
Note that support is set to 19.0.1 which means it will have to be
released using the new addon.xsd format that allows extras to have a
major.micro.minor format. That will be an interesting way to test this
feature.
Change-Id: Id755770f8a121edffa36e0fcb70488c452087440
2013-11-15 20:58:19 -08:00
Joe Fernandez
a7e2ef83da
am 54ec4ff7: am becd685b: am 4233252a: Sample code for OpenGL Android training class
...
* commit '54ec4ff7dfa9e8028f9da1986a73bddb1c00be93':
Sample code for OpenGL Android training class
2013-11-15 12:03:40 -08:00
Joe Fernandez
54ec4ff7df
am becd685b: am 4233252a: Sample code for OpenGL Android training class
...
* commit 'becd685b66f349063f642e2292d21d22d0964ba1':
Sample code for OpenGL Android training class
2013-11-15 11:59:36 -08:00
Joe Fernandez
becd685b66
am 4233252a: Sample code for OpenGL Android training class
...
* commit '4233252af95fe9f12c47fdde92ea4718b3334108':
Sample code for OpenGL Android training class
2013-11-15 19:56:27 +00:00
Joe Fernandez
4233252af9
Sample code for OpenGL Android training class
...
( Original Id: Ib1650025a3c4b018c60d70ede3f25113660f68d8 )
Change-Id: I1d760b75d1f2bfe1ec90c71471867577bd146241
(cherry picked from commit 66f6fe6633 )
2013-11-15 19:15:57 +00:00
Andrew Hsieh
e505d7989a
am 1785c989: am 7956dc3c: am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"
...
* commit '1785c9896296f0e966afe0adf4da21233e636247':
Update time.h for CLOCK_BOOTTIME, etc
2013-11-14 18:41:57 -08:00
Andrew Hsieh
1b5df5cb94
am 1badc519: am a60db2e7: am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
...
* commit '1badc519efb9402583ef18540b21a019cffe2596':
Added missing clock_settime()/clock_nanosleep() in time.h API>=8
2013-11-14 18:41:56 -08:00
Andrew Hsieh
1785c98962
am 7956dc3c: am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"
...
* commit '7956dc3c87503530696ddd42d3a0f71decb0bcf6':
Update time.h for CLOCK_BOOTTIME, etc
2013-11-14 18:38:06 -08:00
Andrew Hsieh
1badc519ef
am a60db2e7: am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
...
* commit 'a60db2e71416714964613c53e0b093bc77aa4442':
Added missing clock_settime()/clock_nanosleep() in time.h API>=8
2013-11-14 18:38:04 -08:00
Andrew Hsieh
7956dc3c87
am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"
...
* commit 'faab12a0586cf4afef6fe2607bcba394c53b1d1d':
Update time.h for CLOCK_BOOTTIME, etc
2013-11-14 18:33:59 -08:00
Andrew Hsieh
a60db2e714
am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
...
* commit '69139a5aa58c0b85fc0d0e9763baa3b52a327e29':
Added missing clock_settime()/clock_nanosleep() in time.h API>=8
2013-11-14 18:33:58 -08:00
Andrew Hsieh
faab12a058
Merge "Update time.h for CLOCK_BOOTTIME, etc"
2013-11-15 02:29:28 +00:00