Commit Graph

16067 Commits

Author SHA1 Message Date
Dan Albert
4f6e60833d am 7baaba83: am 9bc92deb: am 20d16a75: Merge "Silence lcov existence test output."
* commit '7baaba839f12a91216485023a6db4b6e4d18d281':
  Silence lcov existence test output.
2015-03-21 05:14:41 +00:00
Xavier Ducrohet
d1d28519ae am 489fb042: am 91909fae: Prepare the SDK component version numbers.
* commit '489fb042bafcb08aacdafe9fb6b471a42a1bcc22':
2015-03-21 05:14:39 +00:00
Dan Albert
33512044f2 am b8fb935f: am cbe2394e: am 217d230a: Merge "Add acov for coverage gathering/reporting."
* commit 'b8fb935f08882c96b19c0aded8dc632325673561':
  Add acov for coverage gathering/reporting.
2015-03-21 05:14:36 +00:00
Andrew Hsieh
a9c0964266 am 04c78d5c: am 04df6b31: am eef4aba8: Merge "Add missing posix_memalign function in x86 libc.so.functions.txt. (See b.android.com/28834)"
* commit '04c78d5ce67176267dc0f4eeeb7f7cf3eb0b9f37':
  Add missing posix_memalign function in x86 libc.so.functions.txt. (See b.android.com/28834)
2015-03-21 05:14:33 +00:00
Dake Gu
54226208af am c702bbe0: am 7c4d38c4: SupportLeanbackDemo: dont override fragment\'s object from activity
* commit 'c702bbe08a34181d6a2159cecf880e8fc63ab22f':
2015-03-21 05:14:31 +00:00
Dake Gu
4950cef14e am b7613fed: am 7c6a3e4f: Merge "Use image card view for DetailsFragment example" into lmp-dev
* commit 'b7613fed203211d68eb3cf0fc39e14040ef15b1e':
2015-03-21 05:14:28 +00:00
Craig Stout
db77455674 am f5417d29: am a0f2a8db: Fix build.
* commit 'f5417d2915afd439add0b08e926c2a68aa01a181':
2015-03-21 05:14:25 +00:00
Craig Stout
7d9eb7d59d am 4d42aeb8: am 76d6eba7: Use new callback for search by intent.
* commit '4d42aeb8a639bfd6e59f64eb11bd462498b87593':
2015-03-21 05:14:22 +00:00
Siva Velusamy
ab17ec93f7 am 3267c269: am bd2bea18: Update revision of Android SDK USB driver for Windows
* commit '3267c2698b4457bee4fac3c143f8a410911f52ca':
2015-03-21 05:14:19 +00:00
Siva Velusamy
76037a92c2 am 8f068d84: am 6ae0b776: Android SDK Windows USB driver: Project Tango pid
* commit '8f068d8495e3b581578061664f71ded2e53243b2':
2015-03-21 05:14:16 +00:00
Andrew Hsieh
2892773f1c am 7b5283a5: am 6b801349: Merge "Remove out-dated android-20 and android-21 now called android-L" into lmp-dev
* commit '7b5283a55465c405d42a682f790043e9b6298f3e':
2015-03-21 05:14:13 +00:00
Andrew Hsieh
bb08ff6175 am 014f981b: am 726f6d87: am 5b664707: Merge "Bugfix for libportable to make compile happy."
* commit '014f981b1de575067dcc2c8058fa0613043dba75':
  Bugfix for libportable to make compile happy.
2015-03-21 05:14:10 +00:00
Andrew Hsieh
db803855f5 am e72d8800: am 5c0471db: am 3941c44f: Merge "Add support for x86 to hello-neon sample"
* commit 'e72d88005b38dc93bf7a3f444c6d42c4c4c2af3a':
  Add support for x86 to hello-neon sample
2015-03-21 05:14:08 +00:00
Andrew Hsieh
f51a03c2c9 am 8707b139: am 53a20e54: am a8c78c38: Merge "Refresh android-L headers/libs (WW37)"
* commit '8707b139b1c8cd0de5fd96c9cf0205eb82622c82':
  Refresh android-L headers/libs (WW37)
2015-03-21 05:13:53 +00:00
Tyler Gunn
cac75b858d am a6efa2eb: am 2e4aa794: Renaming Telecomm to Telecom.
* commit 'a6efa2ebbe0487739435dd5f41238501235c954c':
2015-03-21 05:13:51 +00:00
Cheuksan Wang
82fe2270df am f5a2be77: am 33fe444f: Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev
* commit 'f5a2be7764913516bc12fda62b5372fcc4382012':
2015-03-21 05:13:49 +00:00
Raphael Moll
cc7d040a6f am a5739c85: am 130967f3: Merge "SDK Addon multi-sys-img support, part 2." into lmp-dev
* commit 'a5739c851cc014a20425583fbe7c6dea59098888':
2015-03-21 05:13:47 +00:00
Michael Wright
b33b3c60a3 am 5709ae1a: am 2326f11a: Change getScreenCaptureIntent to createScreenCaptureIntent.
* commit '5709ae1a13729079f40c10b733958e62499de6a5':
2015-03-21 05:13:44 +00:00
Siva Velusamy
375a89ecc2 am 659b41a5: am 8f47c626: am 7ca91d08: Merge "Android SDK Windows USB driver: Project Tango pid"
* commit '659b41a5826aae0a50e129e67556f7a224ec56b7':
  Android SDK Windows USB driver: Project Tango pid
2015-03-20 22:02:26 +00:00
Siva Velusamy
820c27680e am af7cf6cb: am ad8e06e1: am 372c5b71: Merge "Update revision of Android SDK USB driver for Windows"
* commit 'af7cf6cbef3ad9f8a69bd9442da6de1d12a0b2da':
  Update revision of Android SDK USB driver for Windows
2015-03-20 22:02:23 +00:00
Alan Viverette
88996fe4c1 am 74ec1a8d: am a85567e5: Merge "Fix progress spinner dialog in ApiDemos" into lmp-dev
* commit '74ec1a8dea99c3d3a0c53ab1dde3b9bbfe611434':
2015-03-20 22:02:21 +00:00
anaddaf
d8b0208d16 am b877f021: am b0c76f62: am fb58f56d: am 543a86c1: Merge "Removing the screenOrientation attribute from the wearable manifest" into klp-modular-dev
* commit 'b877f021c0b132df1539dff2dfb94570fd140851':
2015-03-20 22:02:18 +00:00
anaddaf
1538876a15 am 6dd07e2c: am 71d28034: am 684651a6: am ee12f01d: Updating build.gradle files for play services dependency
* commit '6dd07e2c93761d0d7235e1b60414d1eb16f6ec45':
2015-03-20 22:02:13 +00:00
Dave Allison
859f6378b6 am 8bc875bb: am 72e4885c: Merge "Add support for debugging ART to the dalvik.gdb script." into lmp-dev
* commit '8bc875bb40e5dc097100f1f4ab0a821d0e9c77cd':
2015-03-20 22:02:09 +00:00
Andrew Hsieh
f0f544c944 am beecb20e: am 95630dbb: am 913aff62: Merge "libportable to adapt L header functions."
* commit 'beecb20ed89e3c2efb5e41a321c1328f584f19d7':
  libportable to adapt L header functions.
2015-03-20 22:02:04 +00:00
Andrew Hsieh
338135e08e am edae4b9e: am 01b6a398: am 9b87a973: Merge "Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs"
* commit 'edae4b9e6a4fb4b7bc7fd4b4c0d6146839555fde':
  Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs
2015-03-20 22:01:58 +00:00
Alan Viverette
381f209e69 am 5e0bec9b: am b4ced616: Update alert dialogs in ApiDemos for Material theme
* commit '5e0bec9b4fa4f79aecbc3dca092f5f8505f24786':
2015-03-20 22:01:55 +00:00
Andrew Hsieh
26670b5b03 am 69dd152b: am 817e663d: am d715bffe: Merge "Fixed atexit()"
* commit '69dd152bc3bcba967e1e4620c839f1dacfe9c2b7':
  Fixed atexit()
2015-03-20 22:01:52 +00:00
Andrew Hsieh
c94ed9793c am 02fe8832: am 2143196a: am 01a406c8: Merge "Fix build with sensor.h"
* commit '02fe88322eec6d58fcc69feff38b4558f7a4ab5f':
  Fix build with sensor.h
2015-03-20 22:01:49 +00:00
Andrew Hsieh
e470312cdc am 59a3902a: am 0ff0fef9: am 371b6dbe: Merge "ptrace(3) should be varargs"
* commit '59a3902aadfb8efcc7f90abeb38c2532d4c50a81':
  ptrace(3) should be varargs
2015-03-20 22:01:46 +00:00
Andrew Hsieh
1355830af9 am 3e1de653: am 6200d7a4: am b1e7c7b0: Merge "Add __gnuc_va_list in stdio.h to stop gcc from generating include-fixed/stdio.h"
* commit '3e1de653fda035a53fd27ec121a1e72d4d372727':
  Add __gnuc_va_list in stdio.h to stop gcc from generating include-fixed/stdio.h
2015-03-20 22:01:43 +00:00
Andrew Hsieh
bbf2a21ac0 am 611d66bb: am 289d24e0: am fb7bcce6: Merge "Add back arc4random_stir for 32-bit android-L"
* commit '611d66bbf56fac051bb2e19dd39525b326a18b46':
  Add back arc4random_stir for 32-bit android-L
2015-03-20 22:01:40 +00:00
anaddaf
93cf305b6e am 23eeb3ee: am 53f6e127: Merge "Adding a missing permission to phone component" into lmp-dev
* commit '23eeb3eed91de8d41b719092d22c53102e499f81':
2015-03-20 22:01:38 +00:00
Ye Wen
53a9656be0 am 80fc9560: am ab56bf98: Revert "Enforce READ_SMS permission in file provider used by MMS API demo"
* commit '80fc95601863cf971e8460786f3ebc33ad7bb48e':
2015-03-20 22:01:35 +00:00
Ye Wen
1a3539ef51 am d39339d7: am 3060e54b: Enforce READ_SMS permission in file provider used by MMS API demo
* commit 'd39339d734ddea77cc8f979fd6b848a0bf293915':
2015-03-20 22:01:33 +00:00
George Mount
4e997df6fb am 2e15d6e8: am 0911ea8d: Merge "API Review: change SharedElementListener to SharedElementCallback" into lmp-dev
* commit '2e15d6e86bd76c252e3ba30ce6321ca95e51eb7c':
2015-03-20 22:01:31 +00:00
Ye Wen
348adf5584 am 279d2773: am d6ef9163: MMS API cleanup (4/4)
* commit '279d27738d7b3a7eaa9b8a19d887ea1d369d8820':
2015-03-20 22:01:29 +00:00
Andrew Hsieh
3ac503f63b am 54c9ab47: am 35086b3b: am 45b3c498: Merge "Add required permission to sample code"
* commit '54c9ab473c8a5ee52c851442a6e471440e0738e5':
  Add required permission to sample code
2015-03-20 22:01:27 +00:00
Andrew Hsieh
cf4a269a65 am 3b4aacc2: am dfaca9ff: am 61b90c04: Merge "Refresh 64-bit headers/libs (WW36)"
* commit '3b4aacc247ff3b88d9571e959a0eb9eeb1b179a9':
  Refresh 64-bit headers/libs (WW36)
2015-03-20 22:01:22 +00:00
Andrew Hsieh
1f25b7b41d am 25201b2d: am a3dcb3f2: am 811fc430: Merge "Update android-L/include/android"
* commit '25201b2de1528cf150bf70bcd017225d2f6ab0a7':
  Update android-L/include/android
2015-03-20 22:01:18 +00:00
Yigit Boyar
a544bd887e am 444f7e7c: am 319a2029: Merge "SupportV7 Navigation Bar Demo" into lmp-dev
* commit '444f7e7cf30ceb9e225d143d1c98bcab2eb7af1a':
2015-03-20 22:01:16 +00:00
Julian Odell
207ca66977 am e255ed87: am 9b00ec91: Bug 17262099: MMS API changes (multi-project).
* commit 'e255ed875ca2d6d59170edce05e45307cb0ffbf9':
2015-03-20 22:01:14 +00:00
George Mount
671094badf am 96729f2a: am 91df7895: Merge "Changed attribute name." into lmp-dev
* commit '96729f2a49fc99583ed2c1cac532aff1b80196df':
2015-03-20 22:01:12 +00:00
Marco Nelissen
9645d8cd0f am caa3bc3c: am 5c8a816e: Merge "Add required permission to sample code" into lmp-dev
* commit 'caa3bc3c909158d5be2fce2dea584bd5faf0f590':
2015-03-20 22:01:08 +00:00
Elliott Hughes
21e5990739 am 99c64a26: am 6b9a4ef2: am 72bd0479: Merge "Make \'stack\' able to find toolchains regardless of lunch."
* commit '99c64a26fdea069c51eb6944ccd61252a3008a09':
  Make 'stack' able to find toolchains regardless of lunch.
2015-03-20 22:01:04 +00:00
Alan Viverette
67af8471fb am 63fe7fe3: am fe3ba7fb: Add device default light and dark dialogs to ApiDemos
* commit '63fe7fe306e865b2aa653a3edcb7d3ad88312e95':
2015-03-20 22:01:00 +00:00
Jim Miller
7e0347d20e am 8a9f9701: am b52c7ae8: Merge "Revert "Add test options for DPM.setTrustAgentFeaturesEnabled()" until the new API is ready. This reverts commit d6df7362ab4b332a09d12358297056cfeadcaa11." into lmp-dev
* commit '8a9f9701d84a91ceb3a8e411b44ff6708df6b125':
2015-03-20 22:00:56 +00:00
Jeff Hao
c0426a95ef am 47a3e7f1: am 016fc167: Update call to IActivityManager.startActivity.
* commit '47a3e7f1d0b62daf7b5c3e117f3e2974826a7c78':
2015-03-20 22:00:51 +00:00
Qiwen Zhao
bf72962d6e Merge commit '0d6c5e8ec6178206a39f1688ad4b006b0b656a78' into lmp-mr1-ub-dev
Change-Id: Id21837abcf6c0dcb94d28eacd448c7b10c5aafa8
2015-03-20 14:58:40 -07:00
Raphael Moll
0e214e83a3 am 14b1fa68: am 26c34d44: resolved conflicts for merge of 85074d06 to lmp-dev
* commit '14b1fa686c71d8193e348bb6bca8f6ccf647a7da':
2015-03-20 21:50:13 +00:00