Raphael Moll
906ec536f2
am 37684bb0: Merge "resolved conflicts for merge of 14794b20 to klp-dev" into klp-dev
...
* commit '37684bb0653e2e93fb70fb4481799db485a90db1':
Android SDK: build tools 18.1.1 (RS fixes: windows EOL, YUV-to-RGB)
2013-10-10 15:38:25 -07:00
Raphael Moll
37684bb065
Merge "resolved conflicts for merge of 14794b20 to klp-dev" into klp-dev
2013-10-10 22:18:20 +00:00
Tor Norbye
afe40e3f75
am bc9875e2: Merge "Update the api-versions.xml file for KitKat" into klp-dev
...
* commit 'bc9875e27cbc042dc1388b94b1d20a1b46f21fc2':
Update the api-versions.xml file for KitKat
2013-10-10 13:12:06 -07:00
Tor Norbye
bc9875e27c
Merge "Update the api-versions.xml file for KitKat" into klp-dev
2013-10-10 20:08:13 +00:00
Raphael Moll
161314c80b
resolved conflicts for merge of 14794b20 to klp-dev
...
Change-Id: Idfdd970a9c90ca91c23f1780457c6fd8a3644cdc
2013-10-10 12:00:41 -07:00
Raphael Moll
14794b209c
am 3404cd16: am 827c0c16: Android SDK: build tools 18.1.1 (RS fixes: windows EOL, YUV-to-RGB)
...
* commit '3404cd16bfd0fadf7d50a10351ca407d938dbf28':
Android SDK: build tools 18.1.1 (RS fixes: windows EOL, YUV-to-RGB)
2013-10-10 11:52:48 -07:00
Raphael Moll
3404cd16bf
am 827c0c16: Android SDK: build tools 18.1.1 (RS fixes: windows EOL, YUV-to-RGB)
...
* commit '827c0c16080fcb92505945e2210c440571251e3e':
Android SDK: build tools 18.1.1 (RS fixes: windows EOL, YUV-to-RGB)
2013-10-10 11:49:45 -07:00
Siva Velusamy
f14254870e
am 3f12dac9: samples: Do not attempt to clean line endings for *.py DO NOT MERGE
...
* commit '3f12dac94da218f6a706a30201ac7bc06fe4b8ae':
samples: Do not attempt to clean line endings for *.py DO NOT MERGE
2013-10-10 11:32:48 -07:00
The Android Automerger
af7160bdd2
merge in klp-release history after reset to klp-dev
2013-10-10 06:00:38 -07:00
Siva Velusamy
3f12dac94d
samples: Do not attempt to clean line endings for *.py DO NOT MERGE
...
The line endings script changes line endings, but also
removes the executable permissions of the files. We don't
want this to happen for scripts such as systrace.py
(cherry picked from commit de3fa5df07 )
Change-Id: Icee78118d0d7367176e8561338ae547228ee087d
2013-10-09 18:16:06 -07:00
Raphael Moll
827c0c1608
Android SDK: build tools 18.1.1 (RS fixes: windows EOL, YUV-to-RGB)
...
Change-Id: I02c11397681ee543cc5300170e5c2a7ba7e63da8
2013-10-09 15:53:22 -07:00
Raphael Moll
704d17c385
am f2f8671a: Update Android SDK properties for KLP
...
* commit 'f2f8671a929136a5be19e5a30ffe1f8d9ec5e81e':
Update Android SDK properties for KLP
2013-10-09 15:08:27 -07:00
Siva Velusamy
f5eea9d9cb
am aeccc700: am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"
...
* commit 'aeccc7000290f3f2edc59f9ff3a941df0d37ebc3':
samples: Do not attempt to clean line endings for *.py
2013-10-09 15:07:11 -07:00
Siva Velusamy
aeccc70002
am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"
...
* commit '777285ceedba8cda5fb0fe0843fae6a887522c03':
samples: Do not attempt to clean line endings for *.py
2013-10-09 15:02:49 -07:00
Siva Velusamy
777285ceed
Merge "samples: Do not attempt to clean line endings for *.py"
2013-10-09 21:54:41 +00:00
Raphael Moll
f2f8671a92
Update Android SDK properties for KLP
...
Change-Id: I301d300f2e2e2b828ad4f398f3450d09f9329f7f
2013-10-09 14:14:47 -07:00
Siva Velusamy
de3fa5df07
samples: Do not attempt to clean line endings for *.py
...
The line endings script changes line endings, but also
removes the executable permissions of the files. We don't
want this to happen for scripts such as systrace.py
Change-Id: I355cbc4c77cfb3c90e4615962863288680389bce
2013-10-09 09:30:08 -07:00
Tor Norbye
a25bbc368f
Update the api-versions.xml file for KitKat
...
This CL updates the api-versions.xml file, which is a file
used by Lint API check to check which API version each class,
field and method reference was introduced in.
It is generated by running sdk/apigenerator on an SDK install
which has android.jar from all 19 releases of Android installed.
This diff shows some methods getting removed from API 18 which
apparently were not in API 18; the last revision of the file
must have been run on a non-final version of the platform.
Change-Id: If08e4e9f08ae7fecbe938c1e928ad8698ed4025a
2013-10-08 18:16:30 -07:00
Ben Cheng
f2c2829b89
am 44d4d905: am 6972ffa7: Merge "Initial set of minimal sysroot headers to build aarch64-gcc."
...
* commit '44d4d905bf6da9d38cb4695962335c9c8b4a38ad':
Initial set of minimal sysroot headers to build aarch64-gcc.
2013-10-08 16:55:51 -07:00
Ben Cheng
44d4d905bf
am 6972ffa7: Merge "Initial set of minimal sysroot headers to build aarch64-gcc."
...
* commit '6972ffa7981648275119fe62bcdd0e330d2b4312':
Initial set of minimal sysroot headers to build aarch64-gcc.
2013-10-08 16:52:21 -07:00
Ben Cheng
6972ffa798
Merge "Initial set of minimal sysroot headers to build aarch64-gcc."
2013-10-08 23:50:05 +00:00
Ben Cheng
032d79d013
Initial set of minimal sysroot headers to build aarch64-gcc.
...
These files are copied over from arch-arm and to be used as boilerplates
only for now.
Change-Id: I61662e4fb9b7582174ef806e5d7eb8ed28e3a1f6
2013-10-08 15:48:50 -07:00
Ed Heyl
9e76668030
am 1d0f35a4: merge in KQS81M
...
* commit '1d0f35a489fe6ea314ac9f2f2ca21b6507b41554':
2013-10-08 15:45:43 -07:00
Ed Heyl
1d0f35a489
merge in KQS81M
2013-10-08 15:35:49 -07:00
The Android Automerger
29444ec9e2
merge in klp-release history after reset to klp-dev
2013-10-08 06:00:25 -07:00
Andrew Hsieh
ad1de80608
am daf3fdac: am cb83cfb5: Merge "Refresh include/sys/vfs.h"
...
* commit 'daf3fdac2dfa00f77aa11427ff75c5514e2e82a2':
Refresh include/sys/vfs.h
2013-10-07 19:02:20 -07:00
Andrew Hsieh
daf3fdac2d
am cb83cfb5: Merge "Refresh include/sys/vfs.h"
...
* commit 'cb83cfb5fcc9ae9af3d14f1b28c2ba4d0cb519b9':
Refresh include/sys/vfs.h
2013-10-07 19:00:04 -07:00
Andrew Hsieh
cb83cfb5fc
Merge "Refresh include/sys/vfs.h"
2013-10-08 01:58:12 +00:00
Alan Viverette
033acdeed1
am 900169fc: Merge "Update Support4Demos targetSdkVersion to 19" into klp-dev
...
* commit '900169fc23d1c6a8f08f1124c4740002a70a6fc9':
Update Support4Demos targetSdkVersion to 19
2013-10-07 18:18:35 -07:00
Alan Viverette
900169fc23
Merge "Update Support4Demos targetSdkVersion to 19" into klp-dev
2013-10-08 01:10:50 +00:00
Andrew Hsieh
bce02d49a3
am c8a4b555: am 81631c6b: Merge "Little fix for headers comparison tool"
...
* commit 'c8a4b55563d2cdd08ccb97c0c911033e6cfb3a86':
Little fix for headers comparison tool
2013-10-07 17:39:44 -07:00
Andrew Hsieh
c8a4b55563
am 81631c6b: Merge "Little fix for headers comparison tool"
...
* commit '81631c6b3c5ce8c25c216b65014d74b79e0d643e':
Little fix for headers comparison tool
2013-10-07 17:38:31 -07:00
Andrew Hsieh
81631c6b3c
Merge "Little fix for headers comparison tool"
2013-10-08 00:35:43 +00:00
Grigoriy Kraynov
fc36418fb2
Little fix for headers comparison tool
...
Change-Id: Iaa9602a0d5f6864d65bc0e41bef7573bd5499b84
Signed-off-by: Grigoriy Kraynov <grigoriy.kraynov@intel.com >
2013-10-07 17:30:08 +04:00
The Android Automerger
d54f3093e1
merge in klp-release history after reset to klp-dev
2013-10-07 06:00:17 -07:00
Andrew Hsieh
16af6afb9a
Refresh include/sys/vfs.h
...
1. Sync bionic's, remove mips-specific one
2. Fix statfs.c to transfer the new f_flags too
3. Revise comment about --wrap=symbol
Change-Id: If68818e3dcb2a4056cd0b2e100fcfb8b2156c33a
2013-10-07 15:39:47 +08:00
Raphael Moll
292d94f33a
am d98f9f67: am 0c098649: am e2e4daf0: am 54f4ec60: Update SDK doc API 18 package to revision 2.
...
* commit 'd98f9f67b4cf82c960d6e7650e0dc715c05c12af':
Update SDK doc API 18 package to revision 2.
2013-10-06 18:19:15 -07:00
Raphael Moll
200fd07971
am 1961f43f: am 5dec426d: am 4662baea: am f19416c3: Update SDK doc API 18 package to revision 2.
...
* commit '1961f43f4482f6a4b2acff8e50030c25b74a0c32':
Update SDK doc API 18 package to revision 2.
2013-10-06 18:19:14 -07:00
Raphael Moll
d98f9f67b4
am 0c098649: am e2e4daf0: am 54f4ec60: Update SDK doc API 18 package to revision 2.
...
* commit '0c0986490495d0747a4a24cdcfce85c674ef312b':
Update SDK doc API 18 package to revision 2.
2013-10-06 17:11:03 -07:00
Raphael Moll
1961f43f44
am 5dec426d: am 4662baea: am f19416c3: Update SDK doc API 18 package to revision 2.
...
* commit '5dec426dc2594faa5269682eb7cb73a9994a6072':
Update SDK doc API 18 package to revision 2.
2013-10-06 17:11:03 -07:00
Raphael Moll
0c09864904
am e2e4daf0: am 54f4ec60: Update SDK doc API 18 package to revision 2.
...
* commit 'e2e4daf0a86bf93dd64feca91b138dcbb334329a':
Update SDK doc API 18 package to revision 2.
2013-10-06 17:04:03 -07:00
Raphael Moll
5dec426dc2
am 4662baea: am f19416c3: Update SDK doc API 18 package to revision 2.
...
* commit '4662baea885ff35b65826d22ba7ed4720d944efe':
Update SDK doc API 18 package to revision 2.
2013-10-06 17:04:02 -07:00
Raphael Moll
e2e4daf0a8
am 54f4ec60: Update SDK doc API 18 package to revision 2.
...
* commit '54f4ec60e16026e19689b2b87a0c95cd5598ae22':
Update SDK doc API 18 package to revision 2.
2013-10-04 18:28:28 -07:00
Raphael Moll
4662baea88
am f19416c3: Update SDK doc API 18 package to revision 2.
...
* commit 'f19416c38811a90e88b55be87d7429704875a3ba':
Update SDK doc API 18 package to revision 2.
2013-10-04 16:14:47 -07:00
Raphael Moll
54f4ec60e1
Update SDK doc API 18 package to revision 2.
...
Summary: method getDhcpInfo() is being un-deprecated and
a new version of API 18 doc should be released for the SDK.
Bug: 10003785
Change-Id: I8f790f21ade23c8894046c27ad9027fc7cb42687
(cherry picked from commit f19416c388 )
2013-10-04 23:12:43 +00:00
Raphael Moll
f19416c388
Update SDK doc API 18 package to revision 2.
...
Summary: method getDhcpInfo() is being un-deprecated and
a new version of API 18 doc should be released for the SDK.
Bug: 10003785
Change-Id: I8f790f21ade23c8894046c27ad9027fc7cb42687
2013-10-04 15:05:32 -07:00
Alan Viverette
5d5026ee66
Update Support4Demos targetSdkVersion to 19
...
BUG: 10752103
Change-Id: I11954c70b6b6a473a86264ea67961bb3b3a260cd
2013-10-03 17:00:16 -07:00
Kenny Root
6d9f0144eb
am 6182008e: am 88a42f9d: Merge "Fix MIPS build"
...
* commit '6182008e731728fd413da7b12ba3daea0ca81c96':
Fix MIPS build
2013-10-02 18:25:00 -07:00
Kenny Root
6182008e73
am 88a42f9d: Merge "Fix MIPS build"
...
* commit '88a42f9daf0b081a40f7833875df4b04817319f6':
Fix MIPS build
2013-10-02 18:19:12 -07:00
Kenny Root
88a42f9daf
Merge "Fix MIPS build"
2013-10-03 00:24:00 +00:00