quddusc
aca26aa6fc
am a585c22b: am 0f2ebe84: am 60737e95: Merge commit \'3943cdc9\' into manualmerge2
...
* commit 'a585c22baf21c3714dac7a5b2e65bb186e657a80':
2014-05-13 15:16:22 +00:00
Elliott Hughes
f02674c53b
am 9d0e2ca0: am 356cdcbd: am f99585bd: am ff11bce0: am 07bdc2b8: Merge "Fix build."
...
* commit '9d0e2ca0198a2a0b81148d9e4cdba2127f4e2b53':
2014-05-13 15:16:21 +00:00
quddusc
ef4fb79bbf
am c851feed: am 433830c0: am 213a31d7: am b5de8afa: Fixed broken link in ActivityInstrumentation sample description.
...
* commit 'c851feedfb1621733fe05952c61f1596a0e05e2d':
2014-05-13 15:16:19 +00:00
Dirk Dougherty
48a753b17b
am 9425d824: am d036ed77: am 6d63d11e: am cc1867bc: Fix broken javadoc reference.
...
* commit '9425d824792974736108eb6353fe744637c2011f':
2014-05-13 15:16:18 +00:00
quddusc
80aded0809
am d444749e: am 727ff57f: am 0b448c3b: am 11d2eef3: Updated browsable sample descriptions.
...
* commit 'd444749e3b9c1fba2fbd4a0cb560cbf558240dc1':
2014-05-13 15:16:16 +00:00
quddusc
9caed2a83e
am 3a71cc19: am d2b26f74: am a969fb4b: am a76387f7: Updated description for the StorageProvider browseable sample.
...
* commit '3a71cc19ed56c4452136681d6b2b06145d176a93':
2014-05-13 15:16:15 +00:00
Dirk Dougherty
789fb84864
am eb07ea95: am 7f725ffd: am 7656c163: am 2a7b416b: Merge "Add StorageProvider sample code to browseables." into klp-dev
...
* commit 'eb07ea9541ec177fe3c8f2be2f5e8f2c9a50ca60':
2014-05-13 15:16:14 +00:00
Svetoslav Ganov
9a35f85892
am 87625caa: am d89fa640: am a12747bc: am 7c833d71: Merge "Update the print from off-screen WebView sample" into klp-dev
...
* commit '87625caa5e015f480ffc7ab355ef91f43e49f04a':
2014-05-13 15:16:12 +00:00
Adam Koch
fcce85ed31
am de34fbab: am 4544562a: am 70f9c934: am ddba6b87: Merge "KitKat SMS APIs DevByte Sample Code" into klp-dev
...
* commit 'de34fbabb389bee347b2ee8317ac2290cfec5985':
2014-05-13 15:16:11 +00:00
Svetoslav Ganov
4c2672a3b0
am 218f323d: am f9c86a50: am c100e53e: am 79efac6b: Merge "Add print samples to the ApiDemos app." into klp-dev
...
* commit '218f323d8abb75096f09f707571b234163739986':
2014-05-13 15:16:10 +00:00
Dirk Dougherty
e130a24853
am 74f434e5: am 2b39eabe: am c1ef60a2: am 1c254de3: Merge "Add kk to redirects file." into klp-dev
...
* commit '74f434e51c493612afa6d1c4a349455edab1a54d':
2014-05-13 15:16:09 +00:00
Roman Nurik
be169d6096
am c21b6568: am 3a0a7d6a: am 68558338: am 3b6fb5c0: Merge "Add Android 4.4 Immersive Mode DevByte sample code." into klp-dev
...
* commit 'c21b6568628a9cb1c22f51acc813b8c4e7885de9':
2014-05-13 15:16:07 +00:00
Svetoslav
c0ca6a7cf7
am 6c58de49: am 659b59ab: am 22af8556: am 40bea547: Merge "Adding an API demo for how to implement printing in an app." into klp-dev
...
* commit '6c58de49c715d7c573ce312fb4321cff2e7a2f3d':
2014-05-13 15:16:05 +00:00
Dirk Dougherty
c74d80c3c5
am 894c3d95: am 7c4a526b: am dc7ece5f: am 46686c6f: Merge "Add prebuilt browseable samples as static files." into klp-dev
...
* commit '894c3d9560372768e7eab8856c035f367582a4b9':
2014-05-13 15:16:04 +00:00
Andrew Hsieh
cbaddaae77
am 81c1a201: am b970ec3f: am c8e78f48: am 522490da: am 55530bf3: Merge "ndk: Add missing declaration for mkdtemp"
...
* commit '81c1a20189f88d7a4d40a7e7f98d5b18c667d48a':
2014-05-13 15:16:02 +00:00
Andrew Hsieh
60ddcf2e1b
am 4db36d02: am bb8f23a4: am 64b72116: am ba2adddb: am 3fd7d3d3: Merge "cleaned code, added pinch gesture detector, better opengl context handling, fixed issues"
...
* commit '4db36d024d39dbe9cad0a6c73ffeb4ce2a48420f':
2014-05-13 15:16:00 +00:00
Adam Koch
1f7f32c1b9
am f678de00: am e7681200: am 6c8f4d96: am 47e3f029: Bitmapfun Sample: Minor updates to match zip file in training class.
...
* commit 'f678de00bf7bd5c94ef59b5155c45380ca525241':
2014-05-13 15:15:58 +00:00
Ian Ni-Lewis
b0ccced623
am e79e1d42: am 00b7cabe: Merge "cleaned code, added pinch gesture detector, better opengl context handling, fixed issues"
...
* commit 'e79e1d42ac7be5e64d2d3265bbb3d8f31a614a2c':
2014-05-13 15:15:54 +00:00
Elliott Hughes
8ce5393ee7
am 1142d35b: am 1a062a25: am 00d5277a: am 9c527023: am 122d194b: Merge "Fix incorrect extern declaration of poll(2)."
...
* commit '1142d35b032a077d58edb629571513acacadaff0':
2014-05-13 15:15:51 +00:00
Narayan Kamath
408d183c96
am 533a83f6: am e38dba60: am e53bc4d9: am 80b5d8d2: am b4f054a8: Merge "Remove invalid UTF-8 chars from source."
...
* commit '533a83f6b6e76e8c3cc2c3e11bac1d3631ff7d47':
2014-05-13 15:15:48 +00:00
Ben Murdoch
1072747ce0
am 37a0f4ed: am 489c3b6b: Merge "Add mips support to stack tool."
...
* commit '37a0f4ed6616f92b1be7ecc906bb1c8b13e7dbe4':
2014-05-13 15:15:47 +00:00
Tor Norbye
779381999c
am 499f96a5: am 98fd3b44: am 8c37790e: am 15a65401: Update the api-version.xml file to reflect KitKat recent changes
...
* commit '499f96a5e3a5085f6c62a85733cd2e5e800fff33':
2014-05-13 15:15:46 +00:00
Chet Haase
6f8533c207
am 37c4ea46: am a1a8337f: am f02d4487: am 9262e703: Merge "Fix ApiDemo for transitions" into klp-dev
...
* commit '37c4ea4637cd62f7bc27efb16526a4fa457084fe':
2014-05-13 15:15:44 +00:00
Adam Koch
4a296a447a
am 94ebdc8f: am b184cdd9: am fb159c79: am 7165109e: Bitmapfun Sample: Cleanup gradle files to import into Studio properly.
...
* commit '94ebdc8fafcef323870f03f5a63c83f5743bf6ab':
2014-05-13 15:15:40 +00:00
Chong Zhang
3584f2b768
am 03beab7e: am 9d0982d5: am 2e2085f4: am 2ec448a2: am 58ef2c38: am fd6d06a1: mrp sample: refactor and use helper class
...
* commit '03beab7e9508de617cf7c35c4f32047cf779fc44':
2014-05-13 15:15:38 +00:00
Jeff Brown
ba9ddd7f4a
am b133e0e6: am 65f5b5bb: am c683fb4c: am bb1f4a73: am 10f22587: am 6a81c4be: Fix NPE in sample code.
...
* commit 'b133e0e6321fcfc10c26573b2ed07d225e79db58':
2014-05-13 15:15:37 +00:00
Adam Koch
93643bc6e5
am 0ec39f3d: am c352e57b: am 0d873095: am 933dd8a3: Merge "Bitmapfun Sample: Update for KitKat and clean up some minor bugs." into klp-dev
...
* commit '0ec39f3d8027b4acac6405a0d1683510b1fd98c6':
2014-05-13 15:15:35 +00:00
Adam Koch
f732e842db
am f224cd4c: am ad76f956: am 107a3b94: am c246e4a8: Merge "Bitmapfun Sample: Migrate to Android Studio/gradle project." into klp-dev
...
* commit 'f224cd4cc7198a3924fff71c4d2ad07e6d0fd3ff':
2014-05-13 15:15:34 +00:00
Ben Cheng
a82f844560
am b1d6d2e4: am f85cfcfe: am c888278c: am d4b49c6c: am 8edf8ef6: Merge "Refresh sysroot headers for aarch64."
...
* commit 'b1d6d2e4801fe468b45f9b081cb908ac62a63365':
2014-05-13 15:15:32 +00:00
Tor Norbye
af0c4e80a2
am 1163d57b: am 68370aef: am 03a66dd8: am 30278c6f: Merge "Update the api-version.xml file to reflect KitKat recent changes" into klp-dev
...
* commit '1163d57b5de1b7807d02c0e1227b11e51c6c6b1b':
2014-05-13 15:15:31 +00:00
Evan Charlton
a69f916a8b
resolved conflicts for merge of a706c744 to master-nova
...
Change-Id: I18498f7319dbe7ce8a52bb87106339c4046ac2c9
2014-05-12 17:19:20 -07:00
David 'Digit' Turner
72a0c45934
am a9206776: am 3907ebb7: am 94ebf1e6: Merge "libportable: Add dependency on libdl."
...
* commit 'a9206776feed51f027ad9e6dac31b7dc2e5f86cf':
libportable: Add dependency on libdl.
2014-05-12 13:38:41 +00:00
David 'Digit' Turner
a9206776fe
am 3907ebb7: am 94ebf1e6: Merge "libportable: Add dependency on libdl."
...
* commit '3907ebb75e450b02f6996f6fa368ca0d2bacfb4a':
libportable: Add dependency on libdl.
2014-05-12 13:36:05 +00:00
David 'Digit' Turner
3907ebb75e
am 94ebf1e6: Merge "libportable: Add dependency on libdl."
...
* commit '94ebf1e6a993391f8139e4ee4702c02bdda560a9':
libportable: Add dependency on libdl.
2014-05-12 13:31:55 +00:00
David 'Digit' Turner
94ebf1e6a9
Merge "libportable: Add dependency on libdl."
2014-05-12 13:28:34 +00:00
David 'Digit' Turner
e398009921
libportable: Add dependency on libdl.
...
The patch at [1] was reverted because ndk/sources/android/cpu-features
is now part of the platform build (as a dependency of libportable), and
now requires dlopen()/dlsym()/dlclose().
Because the platform build system doesn't support LOCAL_EXPORT_LDLIBS,
add the dependency to libportable's own module definition instead.
After this patch is submitted, it's possible to re-apply the original
patch and get a working build.
[1] https://android-review.googlesource.com/#/c/91380/
BUG=13679666
Change-Id: I54b4376a562242d21631eaf13090650decfe791d
2014-05-12 15:10:01 +02:00
Andrew Hsieh
be9d36572c
am 106c0c69: am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist."
...
* commit '106c0c694c9818fd45fee7afa0af33b25407fb25':
Add libcxx projects and compiler-rt to windows whitelist.
2014-05-12 10:34:52 +00:00
Andrew Hsieh
106c0c694c
am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist."
...
* commit '3d34e6524e035c6f55cac6553c73c7b18f9910c3':
Add libcxx projects and compiler-rt to windows whitelist.
2014-05-12 10:30:32 +00:00
Andrew Hsieh
3d34e6524e
am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist."
...
* commit '7b004d960657c15145ce1272f7a61c8ca4272cd1':
Add libcxx projects and compiler-rt to windows whitelist.
2014-05-12 10:27:46 +00:00
Andrew Hsieh
7b004d9606
Merge "Add libcxx projects and compiler-rt to windows whitelist."
2014-05-12 10:23:36 +00:00
Andrew Hsieh
8433215b56
am c78fab9f: am 829367fd: am 46452519: Merge "Refresh android-20 headers/libs"
...
* commit 'c78fab9f39dd7ac8c0649de6fb5b7f251a4c34f2':
Refresh android-20 headers/libs
2014-05-12 04:01:48 +00:00
Andrew Hsieh
c78fab9f39
am 829367fd: am 46452519: Merge "Refresh android-20 headers/libs"
...
* commit '829367fdb42839e1c1e7bd8ce25206048d8e0a2f':
Refresh android-20 headers/libs
2014-05-12 03:58:05 +00:00
Andrew Hsieh
829367fdb4
am 46452519: Merge "Refresh android-20 headers/libs"
...
* commit '4645251978aaa9e9db0501efb03f56432a1b9b85':
Refresh android-20 headers/libs
2014-05-12 03:53:30 +00:00
Andrew Hsieh
4645251978
Merge "Refresh android-20 headers/libs"
2014-05-12 03:47:32 +00:00
Stephen Hines
d7d603fbbb
Add libcxx projects and compiler-rt to windows whitelist.
...
Change-Id: I2d6189b4e9a0440330d1212dae9396b88b66ea3f
2014-05-09 14:45:58 -07:00
Andrew Hsieh
f81cdeba6a
Refresh android-20 headers/libs
...
bionic: adfc007dbf936bd021d79ba2d2c360a3cfc77be9 5/19 2014
Change-Id: I4836f04d9b5b68abe7896e246c9dffa2e175e4ca
2014-05-09 20:08:02 +08:00
Andrew Hsieh
116bf16d1f
am 870c6634: am 557c79bf: am b769dcb8: Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN"
...
* commit '870c6634cce1ec436b541d3023c318d5a9fd5013':
Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
2014-05-09 02:52:48 +00:00
Andrew Hsieh
870c6634cc
am 557c79bf: am b769dcb8: Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN"
...
* commit '557c79bf9fc30d9978af67db04604fd035d90f97':
Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
2014-05-09 02:48:27 +00:00
Andrew Hsieh
557c79bf9f
am b769dcb8: Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN"
...
* commit 'b769dcb815594fc1407d58c7d1e10f72a48aa196':
Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
2014-05-09 02:43:24 +00:00
Andrew Hsieh
b769dcb815
Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN"
2014-05-09 02:38:01 +00:00