Commit Graph

15285 Commits

Author SHA1 Message Date
Xavier Ducrohet
8f9ddac2be am 396025ca: am f4554e79: am 40ad715f: am 7fc13d7a: am 1cad9512: Merge "Fix repo script to ignore tools"
* commit '396025ca7f5ea6062b403d54269cc3c5b42261d1':
2014-05-13 15:20:57 +00:00
Andrew Hsieh
1cc4683f14 am 39e47ae8: am 08f9413c: am 96dc8d39: am b05c061e: am 4bc52758: Merge "Update epoll.h from bionic"
* commit '39e47ae801b2aed7d5d00a17ad61ab8793980e71':
2014-05-13 15:20:55 +00:00
Jaekyun Seok
f2c0b5135d am a71ffeca: am e4e9dc65: Return result code properly
* commit 'a71ffecabab6f88e7ba5f5ff3045183369f1e702':
2014-05-13 15:20:54 +00:00
Tim Kilbourn
12611b4123 am cae56b0c: (-s ours) am 85283c70: am 62843523: (-s ours) am d91fd1cb: DO NOT MERGE Remove banner from manifest.
* commit 'cae56b0cce69036952a9c37b6eefc323e1a795af':
2014-05-13 15:20:53 +00:00
Raphael Moll
70723fee5d am ee515428: (-s ours) am e9001a4d: am 891910a3: (-s ours) am bde50dcb: (-s ours) am 21980124: (-s ours) Merge "Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.""
* commit 'ee5154282a7eb4aaeef2c9f434180ea48106cf42':
2014-05-13 15:20:52 +00:00
Raphael Moll
ecfa6c486a am 709f6d61: (-s ours) am 11e9c9a0: am 6a059dea: (-s ours) am b38feb4f: (-s ours) am 4a5687a7: (-s ours) Merge "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
* commit '709f6d619374c83f06ee1b45193095800e7ce898':
2014-05-13 15:20:51 +00:00
Raphael Moll
cb9f1b0598 am 16c367e6: am df3914b0: am 257a315e: am 304c8070: am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk"
* commit '16c367e67bda937604971d074b104aba9de08571':
2014-05-13 15:20:50 +00:00
Yigit Boyar
778073f048 am cb23d84f: am 4718dfa4: am 864b97ae: am 6001125a: Merge "Updated recycler view demo with smooth scrolling" into klp-modular-dev
* commit 'cb23d84ffcec7f557b19275607aea908795e5032':
2014-05-13 15:20:49 +00:00
Deepanshu Gupta
500a94fc18 am a0306b19: (-s ours) am adc0e01e: am 5bdd63dd: (-s ours) am c86e4941: am 11ea1bd2: am 99d404c4: am 9761e9c2: (-s ours) am 1f492924: am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit 'a0306b19627632faeae8d12e6bf866e8c910b575':
2014-05-13 15:20:48 +00:00
Deepanshu Gupta
71086d169c am e05e21f8: (-s ours) am b74ba373: am e08df140: (-s ours) am 81ccba52: am 059aa956: am 11ca5f1e: am 5f00e195: (-s ours) am 48ed332b: am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit 'e05e21f8a00850632c13b952110ba0450ea3d522':
2014-05-13 15:20:47 +00:00
Vince Harron
853789dc6c am a56cb482: am e8ab84bb: am ab7ab626: am caa62895: am 611cfde5: Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
* commit 'a56cb48271f5a422f434152e75c98f49f6d7379d':
2014-05-13 15:20:46 +00:00
Andrew Hsieh
e993238d96 am cf159068: am 1b10ec48: am fc30ef32: am 4d8f4793: am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN"
* commit 'cf1590683f70a5f64389bcb84822f5dd65a96c50':
2014-05-13 15:20:45 +00:00
Dave Platt
5c868691cd am 192aa872: am 1dd16c67: Merge "Update sample NSD app to work reliably with current Android"
* commit '192aa872c07805daf337ae20cfa56b2d893d90f2':
2014-05-13 15:20:44 +00:00
Tim Kilbourn
e73203b82a am b941ab64: am d810db81: Merge "Set row heights for browse rows."
* commit 'b941ab64e8dc8e345ee9b520536992e5b3b99393':
2014-05-13 15:20:43 +00:00
Chiao Cheng
3d66ddedcb am e5e49cbb: am e2962681: Merge "Overhaul of intellij-gen script."
* commit 'e5e49cbbac0886baef9e880083fe5cd9ce1519c2':
2014-05-13 15:20:42 +00:00
Bill Yi
d53f48758f am 7830daee: am 9dc9ca97: am b5255dab: am 23f68632: Merge commit \'d297be2136209cab4edbcf8879520f65fb564103\' into HEAD
* commit '7830daee2613700a16c6834c7821bdbd5826870f':
2014-05-13 15:20:40 +00:00
George Mount
51f4765b7e am 010daa96: am 69ac8ef1: Add new sample transition XML.
* commit '010daa9678fa71ea89fea06442498b40902dad40':
2014-05-13 15:20:39 +00:00
Tim Kilbourn
be3dd3855e am 962953db: am 04c85cee: Minor card tweaks for leanback demo.
* commit '962953dba4e2235934c3db996479b6bf66c45047':
2014-05-13 15:20:38 +00:00
Andrew Hsieh
2a793cfbec am ac401545: am be0a44ea: am cb606e1f: am 88765fac: am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan"
* commit 'ac40154598dff19539001166fa7d8493c5e92cd1':
2014-05-13 15:20:37 +00:00
Jim Miller
b0fc69759e am 5f787dde: am 44e89d3e: Merge "Add test harness for new keyguard features: - disable all notifications on secure keyguard - disable unredacted notifications on secure keyguard - disable TrustAgents"
* commit '5f787dde448f70efb6c9f073d27d3ee069e278e6':
2014-05-13 15:20:35 +00:00
Andrew Hsieh
fabd07f828 am b78fd071: am 5999e41a: am b7375594: am 36e2bc95: am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64"
* commit 'b78fd071e5f127eca95b13c6aca6b218f8395b39':
2014-05-13 15:20:34 +00:00
Dongwon Kang
bc9c9b91e4 am 3c365838: am 0bcf62a1: Merge "Add sample ATSC TvInputService app."
* commit '3c365838c09c65e289a57b331c7431fd04428e92':
2014-05-13 15:20:33 +00:00
Andrew Hsieh
14be891179 am 51fe2ff2: am 693f2b69: am a589c985: am 36037576: am 867634ec: Merge "Update libportable to catch up bionic changes."
* commit '51fe2ff2146fa95b3d40c2dcfdccd6af954bb1f3':
2014-05-13 15:20:32 +00:00
Brett Chabot
0120e0a724 am 347737e3: am 2e17ac46: Merge "Temporarily turn off runtest\'s disabling of dalvik verifier"
* commit '347737e393703cb7a03e2e04d8136cdd0667415d':
2014-05-13 15:20:31 +00:00
Jeff Sharkey
69dc413d5a am 8c1e87be: am 4c4580e5: Add code to exercise DocumentsContract.
* commit '8c1e87bef0e834243d94613e8cca646d5cb3cb9c':
2014-05-13 15:20:29 +00:00
Baligh Uddin
bd2c5d3e81 am 03db73bd: (-s ours) am ca5371cd: (-s ours) am b287fd3b: (-s ours) am 96a440d5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '03db73bd369600350c7a70278686330ce32804ee':
2014-05-13 15:20:28 +00:00
Baligh Uddin
5d6c9110d5 am 20648028: (-s ours) am 1ccbf667: (-s ours) am 183a43a4: (-s ours) am 797d8dc9: (-s ours) Import translations. DO NOT MERGE
* commit '206480283ce6d16b3e667f20a282c45b759d7d33':
2014-05-13 15:20:27 +00:00
Andrew Hsieh
2652e9fad1 am be096ae8: am a2bbba8a: am 2e1fab99: am 45db7066: am 19dc3c64: Merge "Add android-20 bionic headers/symbols for 32-bit"
* commit 'be096ae8bb5426ca118f298ca17f66ce21c730c5':
2014-05-13 15:20:25 +00:00
Narayan Kamath
4b6c2c7c8c am ac5abd68: am 28faa949: am 39d51c9a: am eb96f654: am bc6a6036: Merge "Fix the stack/ tool for 64 bit archs."
* commit 'ac5abd6882aa8ea53097eeba0420e1ab42e574eb':
2014-05-13 15:20:23 +00:00
George Mount
99b6989fb8 am a6fd63e4: am f93d4903: Use new Quantum Paper Activity Transitions API.
* commit 'a6fd63e4c6df2f65762db7d243707a42401936f2':
2014-05-13 15:20:22 +00:00
Jerome Poichet
be02946e97 am f2aca8a3: am f46308ba: am a739ccfb: am 08bb3fb7: Adding search to Leanback demo
* commit 'f2aca8a30ede780d7e605ec4eebbba7221e5af55':
2014-05-13 15:20:21 +00:00
Andrew Hsieh
70bb5f63d3 am 7e3215de: am 7ee0870e: am 4b9218d1: am 5ddb5533: am ea0a9548: Merge "Rename lib64 to lib in arch-arm64 and arch-arm64"
* commit '7e3215ded7c0a5f67645db0df706ccfb870a2355':
2014-05-13 15:20:20 +00:00
Andrew Hsieh
255f425582 am 9feb1eca: am 7dd3e216: am 0d889ad0: am 09c7713d: am 02a8646f: Merge "Remove _GLOBAL_OFFSET_TABLE_ from mips\' libstdc++.so.variables.txt"
* commit '9feb1ecab696adc51bc5fd0e8e101ae0bced7ea3':
2014-05-13 15:20:19 +00:00
Andrew Hsieh
54405de403 am 21ca146e: am 666170d1: am 029b00ef: am 75c7ca08: am c6f2450d: Merge "Add libstdc++ symbols for 64-bit archs"
* commit '21ca146ed2ab6d2fa15e758d35c111602fa6f1eb':
2014-05-13 15:20:17 +00:00
Ricardo Cervera
1406836a7b am d42b6e27: am 4de6a589: am 4701ac6e: am 5f9077b3: am 2dba5be6: am d5ec144b: Merge "docs: Updated samples descriptions for Apr samples push." into klp-docs
* commit 'd42b6e27c3fff818a9500d157cf53f342df889e3':
2014-05-13 15:20:16 +00:00
Alexander Lucas
3ce7e3f5e1 am d4e2c32d: am b9581d5a: am 229d4df3: am 5bf3d523: am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree
* commit 'd4e2c32d824f8e8c323cc916523e8ebfe6fe4122':
2014-05-13 15:20:15 +00:00
Alexander Lucas
f9e12c70fb am 74c42754: am b015fd0f: am b020e934: am ad5f0e86: am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs
* commit '74c42754aa7b6c174cb8d430e62e36fae83a3e3a':
2014-05-13 15:20:14 +00:00
Andrew Hsieh
2d88e724cc am 82b5daf2: am 6bb8a8a5: am 75764b4c: am 97af2619: am 377e5e9b: Merge "Update 64-bit headers/libs"
* commit '82b5daf2cd0075f0bcfef106fcd9e1b1141b098a':
2014-05-13 15:20:09 +00:00
Alexander Lucas
4cd6a9af91 am 95b8d33d: am f0052e3b: am e5d22f68: am e6dcd2f5: am 4bf9ebc7: am fb5e574e: Updated browseable samples for april push
* commit '95b8d33dd233dfbc5fb5dc6acd9a33caf813db84':
2014-05-13 15:20:08 +00:00
Andrew Hsieh
7c75e719c6 am a1ae498e: am ea45910c: am 3fc69fb1: am 21de3013: am f90d4304: Merge "Remove accidentally committed in Makefile."
* commit 'a1ae498e92026308c14c1a2efa2586645bbe19b4':
2014-05-13 15:20:07 +00:00
Xavier Ducrohet
42a9514fc4 am da4f3729: (-s ours) am f3ee0f86: am c514a33d: (-s ours) am 4c3d9d23: am 26b61880: Move support lib to 19.2.0. Do not merge.
* commit 'da4f37290be08ea1690b0d0361b7f4570f03fc58':
2014-05-13 15:20:06 +00:00
Andrew Hsieh
7f95fb4ad0 am 27d5cdaa: am c88b9497: am f3109db8: am 37f3302d: am 6db591b9: Merge "Directories/symlinks changes for x86_64 support"
* commit '27d5cdaa943d805819013110d2bbc6ae7c566967':
2014-05-13 15:20:04 +00:00
Brian Attwell
55ac0a4104 am 4ec8b6af: am 27305158: Remove stream activities from sample sync adapter
* commit '4ec8b6af9a8df8e86aa423fc54d5ee35fd17cb4f':
2014-05-13 15:20:03 +00:00
Andrew Hsieh
06dbc5fe04 am 34a88af2: am 62bfb470: am 0c3ed0f3: am 11cd67cc: am 2d2e407f: Merge "Implement libportable for unknown arch 64bit."
* commit '34a88af2bb81462fa13d90ee64a64c2f60a4ef17':
2014-05-13 15:20:02 +00:00
Tim Kilbourn
e41be06133 am adbc69e7: am 931d5741: am 55458e67: am e0cd23d9: Use ImageCardview in leanback samples.
* commit 'adbc69e7fac91c20b155470ddafceb21ef8f702e':
2014-05-13 15:20:01 +00:00
Alan Viverette
6d31940b9f am 3ccf4b43: am 676bf550: Merge "Update ApiDemos to use API 20, default theme"
* commit '3ccf4b430d9c7339038d07c11889d221992e1121':
2014-05-13 15:20:00 +00:00
Craig Stout
21a0338031 am fbf3f914: am 269cc366: am f6da1180: am 3d2e6fb9: Add VerticalGridActivity to the leanback demo.
* commit 'fbf3f914b3aba80f1ab700fc4f3a042d487d5933':
2014-05-13 15:19:59 +00:00
Alan Viverette
4d4f8e80ce am 80ab488d: am f8f90106: Merge "Fix numbering in API Demos"
* commit '80ab488de37860d50ad4d4100db20aa591666ca3':
2014-05-13 15:19:57 +00:00
Steve Moyer
c3ca48803e am 2cdb05af: (-s ours) am e4e5195e: am f457a863: (-s ours) am 1601b1c9: (-s ours) am 6c56e9e1: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner"
* commit '2cdb05af479674e9085465365b5b04159d9add7b':
2014-05-13 15:19:56 +00:00
George Mount
af5cfacc74 am f52d012c: am b3059f87: Use framework Transition MoveImage and Slide
* commit 'f52d012cf2a7c3a188d8c08998a89fc6d058f366':
2014-05-13 15:19:55 +00:00