Commit Graph

14153 Commits

Author SHA1 Message Date
Andrew Hsieh
a131dee497 am 0f69afed: am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
* commit '0f69afedc212d49a4141a953302f1a165c1316c8':
  Fix headers to be inclued alone
2014-01-16 17:17:30 +00:00
Andrew Hsieh
be13dbd7b8 am de53375f: am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
* commit 'de53375f23faa38684ca6045067a2e797760f655':
  Fix typo in comments in looper.h
2014-01-16 17:17:29 +00:00
Andrew Hsieh
470ec2be44 am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
* commit '0423f030642f78d0e107b3c43b75b0ff11fc2e3e':
  Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:17:28 +00:00
Andrew Hsieh
0f69afedc2 am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
* commit 'b14ac43dbd37c9519b339a99468b1d4a38ec2ce4':
  Fix headers to be inclued alone
2014-01-16 17:14:39 +00:00
Andrew Hsieh
de53375f23 am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
* commit 'f991c5478e8d82e1aa76c1c0a5f813cd5716e171':
  Fix typo in comments in looper.h
2014-01-16 17:14:38 +00:00
Andrew Hsieh
0423f03064 am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
* commit '28c9c34d8670266add371e9f0f33e4da52a024f4':
  Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:14:37 +00:00
Andrew Hsieh
b14ac43dbd am ca34e29d: Merge "Fix headers to be inclued alone"
* commit 'ca34e29d94056bfc20b6b9ea8b36b41763acfe61':
  Fix headers to be inclued alone
2014-01-16 09:09:58 -08:00
Andrew Hsieh
f991c5478e am 42bb3bca: Merge "Fix typo in comments in looper.h"
* commit '42bb3bcadc1611efa2632e83eb5d094f60b82263':
  Fix typo in comments in looper.h
2014-01-16 09:09:57 -08:00
Andrew Hsieh
28c9c34d86 am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
* commit '6d2d58de54169cd2cae9dbf3f69bd52af87daae5':
  Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 09:09:56 -08:00
Andrew Hsieh
ca34e29d94 Merge "Fix headers to be inclued alone" 2014-01-16 17:03:03 +00:00
Andrew Hsieh
42bb3bcadc Merge "Fix typo in comments in looper.h" 2014-01-16 17:02:47 +00:00
Andrew Hsieh
6d2d58de54 Merge "Fixed asset_manager.h, rect_manager.h, and jni.h" 2014-01-16 17:02:36 +00:00
Santos Cordon
5c67ce0ba1 resolved conflicts for merge of 17bfc712 to master-nova-dev
Change-Id: I26fb365b5c937bd1758e951eceac2eef5c0323de
2014-01-15 15:24:55 -08:00
Amith Yamasani
17bfc71291 am a7244cfc: am 52cf96e9: Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
* commit 'a7244cfc93edb8dabc35f258ec828e358d61befa':
  Update eclipse classpath due to change in directory structure
2014-01-15 14:11:41 -08:00
Amith Yamasani
a7244cfc93 am 52cf96e9: Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
* commit '52cf96e9aa650ff50a0a25924e81bec35be56c4f':
  Update eclipse classpath due to change in directory structure
2014-01-15 22:08:57 +00:00
Amith Yamasani
52cf96e9aa Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev 2014-01-15 22:06:55 +00:00
Andrew Hsieh
2c8776805a Fix headers to be inclued alone
See b.android.com/64679 for one of header sys/prctl.h

Change-Id: Ie415ebe2086d2f0190d84fba0c57cc7e1e5822ae
2014-01-13 12:58:46 +08:00
Santos Cordon
70939ca364 Adding telecomm-unit alias for running telecomm tests with runtest.
Change-Id: I52ff6845e69a5989e34b0c506e0ae677c7d8aa01
2014-01-10 21:19:02 +00:00
Andrew Hsieh
66febb3347 am 02f789fb: am bee62e6e: am 926d852a: am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
* commit '02f789fb4e7bac9f79ca9c0db29a246e0c7e0196':
  Implement wait4 already exist in header
2014-01-10 02:00:30 +00:00
Andrew Hsieh
02f789fb4e am bee62e6e: am 926d852a: am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
* commit 'bee62e6e924c6e5f44511d5523467f549e95c12b':
  Implement wait4 already exist in header
2014-01-09 17:57:49 -08:00
Andrew Hsieh
bee62e6e92 am 926d852a: am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
* commit '926d852a5b838f0faa632839c31c4274e93cf200':
  Implement wait4 already exist in header
2014-01-10 01:54:30 +00:00
Andrew Hsieh
926d852a5b am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
* commit '1c9e736166ee6d00962360d1a41a840862346562':
  Implement wait4 already exist in header
2014-01-10 00:41:31 +00:00
Andrew Hsieh
1c9e736166 am 3517e742: Merge "Implement wait4 already exist in header"
* commit '3517e742e3df5a61e622204dbb8d4110b5bad3ac':
  Implement wait4 already exist in header
2014-01-09 16:36:48 -08:00
Andrew Hsieh
3517e742e3 Merge "Implement wait4 already exist in header" 2014-01-10 00:31:50 +00:00
Xavier Ducrohet
3c92c20ed7 am 229a9f3d: am 054d7849: resolved conflicts for merge of 7d85d0a9 to master
* commit '229a9f3dab91b65d0a35b91b7403895797f0380d':
  Update build tools to 19.0.2
2014-01-09 21:37:05 +00:00
Xavier Ducrohet
0c449f7f5f am 817e252b: am 39c7e520: am 699fdf70: am c7e44de1: am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
* commit '817e252bd8838771c70b7e9916781b680eeece08':
  Properly package the RS support bc file.
2014-01-09 21:37:04 +00:00
Andrew Hsieh
0de6f4b27f am dcf33b9c: am 73524a91: am bc5de16b: am e89c4f7f: am 365e66fe: Merge "Fixed API18 math.h for clang3.4"
* commit 'dcf33b9c455b6b16e12023bbc0c1e18198b6687f':
  Fixed API18 math.h for clang3.4
2014-01-09 21:37:03 +00:00
Andrew Hsieh
a2f8dd5576 am 62bc88bc: am 7967d358: am 1fd910a7: am cbe87010: am 29c857fe: Merge "Restore immersive mode when volume button has been pressed."
* commit '62bc88bcc67ebef7e4dbb8c212cdae750428167b':
  Restore immersive mode when volume button has been pressed.
2014-01-09 21:37:02 +00:00
Andrew Hsieh
9bb60133be am acedfdee: am 8eff33c2: am 0862223e: am 412eed7a: am 13f2b7e1: Merge "Fix rendering issue in Tegra2/3."
* commit 'acedfdee981605021607f6e9b611e066a04403e5':
  Fix rendering issue in Tegra2/3.
2014-01-09 21:37:01 +00:00
Andrew Hsieh
8e2944e0a5 am 10826fb2: am 5ed6ffdc: am 4ecd37d0: am 57ebb3aa: am 7c35de7f: Merge "Add support for building the NDK\'s native_app_glue."
* commit '10826fb2863514203710b6b854dea0a15b3de5e0':
  Add support for building the NDK's native_app_glue.
2014-01-09 21:37:00 +00:00
Andrew Hsieh
1822cbc2cc am d445647f: am 575bd012: am d9abded2: am 7a432f8c: am 11728ce9: Merge "Workaround the __builtin_isnan() type error for clang 3.4."
* commit 'd445647f01c0cae9ab4d415f9178af91212fe83f':
  Workaround the __builtin_isnan() type error for clang 3.4.
2014-01-09 21:36:58 +00:00
Christopher Ferris
fa865696d0 am a6083378: am ad9fef85: am a8a66a4e: am 3356457a: am 9092f8fb: Merge "Use uapi kernel headers."
* commit 'a608337839a3ba906f3cfed51705dbc94310cbea':
  Use uapi kernel headers.
2014-01-09 21:36:57 +00:00
Adam Powell
a5c39b2bea am a094ce56: am d6ffb0ae: am 544a42f0: Example activity for RecyclerView
* commit 'a094ce56778af581c3b518ce92eb87e36952462f':
  Example activity for RecyclerView
2014-01-09 21:36:56 +00:00
Tor Norbye
d4856d426d am ac65c5ac: am 09ace69a: Remove Nullable annotation
* commit 'ac65c5ac91935df3d3706651fe38da031166e264':
  Remove Nullable annotation
2014-01-09 21:36:55 +00:00
Andrew Hsieh
29fb9a8c7f am a95b29a1: am 0e502601: am 2ead849b: am 0c5907b3: am 2f5fa0be: Merge "ndk: Fix wait4() declarations"
* commit 'a95b29a1b468c1412e2627f66ed70c274ee4346c':
  ndk: Fix wait4() declarations
2014-01-09 21:36:54 +00:00
Narayan Kamath
25063df21f am 7a3759d4: am 10e82353: am 7d3b1cc2: am 4ebf0371: am 1e18a584: Merge "Whitelist libziparchive for windows."
* commit '7a3759d4a88e294e180185d57074e017c8adf40d':
  Whitelist libziparchive for windows.
2014-01-09 21:36:52 +00:00
George Mount
2bf9675a71 am 9d675bc0: am 3dd963e5: Merge "Add Trim Path API demo."
* commit '9d675bc04f8687e992de5bdf91a3622f42bc3dc7':
  Add Trim Path API demo.
2014-01-09 21:36:51 +00:00
Qiwen Zhao
90953d440f am 0afedc06: am 21657766: am a924e71c: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit '0afedc0682bed5ebba01a3e35d8944a77b239733':
2014-01-09 21:36:49 +00:00
Qiwen Zhao
a4bf00a43a am 98f5f30d: am a924e71c: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit '98f5f30db5b18677cbff45f9d13a4a397a31a53b':
2014-01-09 21:36:48 +00:00
Baligh Uddin
31f0116010 am 7639f8d7: am 44c0b09b: Remove deprecated locales
* commit '7639f8d7e6676f364936c4fc46908fd0dace12d3':
  Remove deprecated locales
2014-01-09 21:36:47 +00:00
Qiwen Zhao
91c93990e8 am 8a0d04b9: am 01bd07ca: (-s ours) am 5e84ff2c: (-s ours) snap to klp-dev-plus-aosp f57b1e0 with history
* commit '8a0d04b9f72d716474312893979883b055b3f809':
2014-01-09 21:36:46 +00:00
The Android Open Source Project
32c419e557 am 9988001a: am f57b1e03: am e0f497fe: Merge commit \'54ec4ff7dfa9e8028f9da1986a73bddb1c00be93\' into HEAD
* commit '9988001a32b2191d335ecc4810c47383f7804f41':
2014-01-09 21:36:45 +00:00
Andrew Hsieh
cd85c62c02 am a1127d76: am 8e938888: am a77377be: Merge "Annotate JNICALL with __NDK_FPABI__"
* commit 'a1127d76f4e06ddf0d56f711d9c401a52ae3eb47':
  Annotate JNICALL with __NDK_FPABI__
2014-01-09 21:36:44 +00:00
Andrew Hsieh
54d687de9b am 2b544b12: am d43cf5c8: (-s ours) am a79d5399: am fa73c847: am 54723fb6: Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h"
* commit '2b544b12a33434a1bdaefaf680cf9f98b640010b':
2014-01-09 21:36:43 +00:00
Dianne Hackborn
0568039d7b am 49ead054: am 1437d2c3: am 59e6f5d9: am 18159037: Add API demo for game style system UI interaction.
* commit '49ead054687984d5ab4ca6040c0d7beb51de1006':
  Add API demo for game style system UI interaction.
2014-01-09 21:36:42 +00:00
Andrew Hsieh
355ba9beff am ccf9e0c6: am 3ee7860e: am 9e09a8e8: Merge "Fix -mhard-float for calling __builtin_* math functions"
* commit 'ccf9e0c65147ec74c0a9cf1282b9d5392387c213':
  Fix -mhard-float for calling __builtin_* math functions
2014-01-09 21:36:41 +00:00
Raphael Moll
7501a97506 am cfed45de: am 51fa6c5c: am aa198e6c: am 3519ce6e: Adjust SDK revisions for KLP MR1 for platform and samples
* commit 'cfed45de87ae2eff36419a8826057c0905bad507':
  Adjust SDK revisions for KLP MR1 for platform and samples
2014-01-09 21:36:40 +00:00
Andrew Hsieh
56d673c388 am 7582b31a: am eb9388bc: am d9c17aa7: Merge "Enhance hello-jni to report APP_ABI at compilation"
* commit '7582b31a67210cb6c79556b0f41364be715280d4':
  Enhance hello-jni to report APP_ABI at compilation
2014-01-09 21:36:39 +00:00
Raphael Moll
42070064b9 am 65bde24c: am 90157f82: am f7624c5a: am c04b7aad: SDK Repository: switch to sdk addon revision 6.
* commit '65bde24ccfb9b055347da1d592bcde368ed54086':
  SDK Repository: switch to sdk addon revision 6.
2014-01-09 21:36:38 +00:00
Katie McCormick
4d59e66f4f am 338417d1: am 4afb47eb: am b652393d: am b3017f4d: Sample code: bug fix
* commit '338417d10bfd0f36e84932835a411e94c0a22ee9':
  Sample code: bug fix
2014-01-09 21:36:37 +00:00