Cheuksan Wang
f5a2be7764
am 33fe444f: Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev
...
* commit '33fe444f11744c2186b29d31db23bb5e859c6019':
Send and download MMS via content provider instead of PDU bytes.
2014-09-12 19:07:06 +00:00
Cheuksan Wang
33fe444f11
Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev
2014-09-12 17:08:18 +00:00
Raphael Moll
a5739c851c
am 130967f3: Merge "SDK Addon multi-sys-img support, part 2." into lmp-dev
...
* commit '130967f3d3f34fc656dc43e43087d0a0c3ae5439':
SDK Addon multi-sys-img support, part 2.
2014-09-12 05:43:02 +00:00
Michael Wright
5709ae1a13
am 2326f11a: Change getScreenCaptureIntent to createScreenCaptureIntent.
...
* commit '2326f11a21107510c6c39763d8dbf99732933443':
Change getScreenCaptureIntent to createScreenCaptureIntent.
2014-09-12 05:43:00 +00:00
Raphael Moll
130967f3d3
Merge "SDK Addon multi-sys-img support, part 2." into lmp-dev
2014-09-11 22:28:57 +00:00
Michael Wright
2326f11a21
Change getScreenCaptureIntent to createScreenCaptureIntent.
...
Bug: 17389882
Change-Id: Icaccc6572f7fd5865f3013960bae196afa6d5dd5
2014-09-11 19:37:51 +00:00
Siva Velusamy
659b41a582
am 8f47c626: am 7ca91d08: Merge "Android SDK Windows USB driver: Project Tango pid"
...
* commit '8f47c626099cbae6eb4c8ed1af1ac5bc41a54dff':
Android SDK Windows USB driver: Project Tango pid
2014-09-11 14:33:34 +00:00
Siva Velusamy
af7cf6cbef
am ad8e06e1: am 372c5b71: Merge "Update revision of Android SDK USB driver for Windows"
...
* commit 'ad8e06e199eeb8237d8e95ead519b3429cc753af':
Update revision of Android SDK USB driver for Windows
2014-09-11 14:33:30 +00:00
Siva Velusamy
8f47c62609
am 7ca91d08: Merge "Android SDK Windows USB driver: Project Tango pid"
...
* commit '7ca91d08027bbc4a6ccd9634e28735bbbbce910a':
Android SDK Windows USB driver: Project Tango pid
2014-09-11 14:20:44 +00:00
Siva Velusamy
ad8e06e199
am 372c5b71: Merge "Update revision of Android SDK USB driver for Windows"
...
* commit '372c5b71a6c26238f8e3376059b76ff8fc349b5d':
Update revision of Android SDK USB driver for Windows
2014-09-11 14:20:43 +00:00
Siva Velusamy
7ca91d0802
Merge "Android SDK Windows USB driver: Project Tango pid"
2014-09-11 14:11:38 +00:00
Siva Velusamy
372c5b71a6
Merge "Update revision of Android SDK USB driver for Windows"
2014-09-11 14:11:30 +00:00
Alan Viverette
74ec1a8dea
am a85567e5: Merge "Fix progress spinner dialog in ApiDemos" into lmp-dev
...
* commit 'a85567e5e8f009e0e88f58ab3cec47948faf2988':
Fix progress spinner dialog in ApiDemos
2014-09-10 23:38:19 +00:00
Alan Viverette
a85567e5e8
Merge "Fix progress spinner dialog in ApiDemos" into lmp-dev
2014-09-10 23:17:22 +00:00
Siva Velusamy
f41962ca29
Android SDK Windows USB driver: Project Tango pid
...
Change-Id: Id4a366755390338d9b8add35ad2df66eda9f2324
2014-09-10 14:19:42 -07:00
Siva Velusamy
05467d3526
Update revision of Android SDK USB driver for Windows
...
Rev 11 adds Project Tango (generic) drivers
Change-Id: Idfb99426ec3553fee2a8d2ec2d04dba029732ebe
2014-09-10 14:18:24 -07:00
anaddaf
b877f021c0
am b0c76f62: am fb58f56d: am 543a86c1: Merge "Removing the screenOrientation attribute from the wearable manifest" into klp-modular-dev
...
* commit 'b0c76f62e70440591d611eb3c422e0afa7a737fa':
Removing the screenOrientation attribute from the wearable manifest
2014-09-10 17:44:03 +00:00
anaddaf
6dd07e2c93
am 71d28034: am 684651a6: am ee12f01d: Updating build.gradle files for play services dependency
...
* commit '71d28034305514044ec935d4c5d88c3e46ce99be':
Updating build.gradle files for play services dependency
2014-09-10 17:44:01 +00:00
anaddaf
b0c76f62e7
am fb58f56d: am 543a86c1: Merge "Removing the screenOrientation attribute from the wearable manifest" into klp-modular-dev
...
* commit 'fb58f56d3a9c6654f362e18a0dedc417b873a96c':
Removing the screenOrientation attribute from the wearable manifest
2014-09-10 17:21:30 +00:00
anaddaf
71d2803430
am 684651a6: am ee12f01d: Updating build.gradle files for play services dependency
...
* commit '684651a66edba3c6a2ed8c481bc1df440fd4e97a':
Updating build.gradle files for play services dependency
2014-09-10 17:21:28 +00:00
anaddaf
fb58f56d3a
am 543a86c1: Merge "Removing the screenOrientation attribute from the wearable manifest" into klp-modular-dev
...
* commit '543a86c17b523b94b0639d490bfbb0e225045456':
Removing the screenOrientation attribute from the wearable manifest
2014-09-10 17:09:30 +00:00
anaddaf
684651a66e
am ee12f01d: Updating build.gradle files for play services dependency
...
* commit 'ee12f01d6bc77f82a2f82f82ae4c74528f62e749':
Updating build.gradle files for play services dependency
2014-09-10 17:09:22 +00:00
anaddaf
543a86c17b
Merge "Removing the screenOrientation attribute from the wearable manifest" into klp-modular-dev
2014-09-10 16:26:16 +00:00
anaddaf
34eb5d8c69
Removing the screenOrientation attribute from the wearable manifest
...
Bug: 17397357
Change-Id: I81cc3500d25fe22b21ba820d8999a547d8d78097
2014-09-10 09:20:17 -07:00
anaddaf
ee12f01d6b
Updating build.gradle files for play services dependency
...
A number of samples were not using the play services from the
repository. In one sample, the incorrect variant
of play services was used on the wearable module.
Bug: 17196108
Change-Id: I5276747a0c7eaf48c542d2540c36819422839d9b
2014-09-10 09:10:50 -07:00
Alan Viverette
bbb85f6351
Fix progress spinner dialog in ApiDemos
...
BUG: 17446820
Change-Id: If6201e4483a5102d0f1567a36d1edf70392d5b8f
2014-09-09 18:20:08 -07:00
Cheuksan Wang
cfb685d52e
Send and download MMS via content provider instead of PDU bytes.
...
Change-Id: Ib5a93d07799c9e14fea8be820c6bd4bc7ae8be3a
2014-09-09 16:53:38 -07:00
Dave Allison
8bc875bb40
am 72e4885c: Merge "Add support for debugging ART to the dalvik.gdb script." into lmp-dev
...
* commit '72e4885cb6152c6bb4e5607d3aa3df2b8ed3a79d':
Add support for debugging ART to the dalvik.gdb script.
2014-09-09 21:56:11 +00:00
Dave Allison
72e4885cb6
Merge "Add support for debugging ART to the dalvik.gdb script." into lmp-dev
2014-09-09 20:22:26 +00:00
Andrew Hsieh
beecb20ed8
am 95630dbb: am 913aff62: Merge "libportable to adapt L header functions."
...
* commit '95630dbbc1701d28a47f46e508aa3ad567121947':
libportable to adapt L header functions.
2014-09-09 03:34:26 +00:00
Andrew Hsieh
95630dbbc1
am 913aff62: Merge "libportable to adapt L header functions."
...
* commit '913aff625fc66b094eae65db072be1c6bcfbf72e':
libportable to adapt L header functions.
2014-09-09 03:19:20 +00:00
Andrew Hsieh
913aff625f
Merge "libportable to adapt L header functions."
2014-09-09 03:09:23 +00:00
WenHan Gu
bce5ab4f3f
libportable to adapt L header functions.
...
Change-Id: Ie15c321ee3b1b21f264b12641bc064ee33dec418
2014-09-09 02:53:13 +00:00
Andrew Hsieh
edae4b9e6a
am 01b6a398: am 9b87a973: Merge "Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs"
...
* commit '01b6a398f71e2a11edeef1b15402a0efb75725f3':
Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs
2014-09-09 00:47:24 +00:00
Andrew Hsieh
01b6a398f7
am 9b87a973: Merge "Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs"
...
* commit '9b87a9735aaa041c843b511d5d0240202766c8bf':
Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs
2014-09-09 00:36:23 +00:00
Andrew Hsieh
9b87a9735a
Merge "Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs"
2014-09-09 00:30:17 +00:00
Dave Allison
22382a4774
Add support for debugging ART to the dalvik.gdb script.
...
This adds two commands:
art-on
art-off
To the gdbclient script for debugging ART-based executables in gdb.
The default is 'art-on'
Bug: 17409881
Change-Id: I90a1aed603e50853a40d5f5ec1c9b168dc17ddc7
2014-09-08 16:33:24 -07:00
Alan Viverette
5e0bec9b4f
am b4ced616: Update alert dialogs in ApiDemos for Material theme
...
* commit 'b4ced6163bf7704942314a12a7650589cd4a4fc1':
Update alert dialogs in ApiDemos for Material theme
2014-09-08 20:25:59 +00:00
Andrew Hsieh
69dd152bc3
am 817e663d: am d715bffe: Merge "Fixed atexit()"
...
* commit '817e663dbfe998557c38f1c73d74257371a34754':
Fixed atexit()
2014-09-08 03:05:34 +00:00
Andrew Hsieh
02fe88322e
am 2143196a: am 01a406c8: Merge "Fix build with sensor.h"
...
* commit '2143196a09f5100a00f68f3292b9cc3ae7733248':
Fix build with sensor.h
2014-09-08 03:05:32 +00:00
Andrew Hsieh
59a3902aad
am 0ff0fef9: am 371b6dbe: Merge "ptrace(3) should be varargs"
...
* commit '0ff0fef97bd9cb9c5d9f42b2c348e19d68dfc20a':
ptrace(3) should be varargs
2014-09-08 03:05:31 +00:00
Andrew Hsieh
3e1de653fd
am 6200d7a4: am b1e7c7b0: Merge "Add __gnuc_va_list in stdio.h to stop gcc from generating include-fixed/stdio.h"
...
* commit '6200d7a45d9b1e433d135107cdb85c2753f22a7c':
Add __gnuc_va_list in stdio.h to stop gcc from generating include-fixed/stdio.h
2014-09-08 03:05:28 +00:00
Andrew Hsieh
611d66bbf5
am 289d24e0: am fb7bcce6: Merge "Add back arc4random_stir for 32-bit android-L"
...
* commit '289d24e09a72d41c7c2675969083b0e755efa787':
Add back arc4random_stir for 32-bit android-L
2014-09-08 03:05:03 +00:00
Andrew Hsieh
65df8d683e
Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs
...
Change-Id: Iee4bf016a0e929209143ec3fa79d542d34fd8917
2014-09-07 19:44:00 -07:00
Andrew Hsieh
817e663dbf
am d715bffe: Merge "Fixed atexit()"
...
* commit 'd715bffe043a09a74c3c63e988742e589da705eb':
Fixed atexit()
2014-09-08 02:42:16 +00:00
Andrew Hsieh
2143196a09
am 01a406c8: Merge "Fix build with sensor.h"
...
* commit '01a406c8eef024ff91268a0b385f372109de13ad':
Fix build with sensor.h
2014-09-08 02:42:15 +00:00
Andrew Hsieh
0ff0fef97b
am 371b6dbe: Merge "ptrace(3) should be varargs"
...
* commit '371b6dbef621f318b1d94b59b8472b3aeaae9dcf':
ptrace(3) should be varargs
2014-09-08 02:42:14 +00:00
Andrew Hsieh
6200d7a45d
am b1e7c7b0: Merge "Add __gnuc_va_list in stdio.h to stop gcc from generating include-fixed/stdio.h"
...
* commit 'b1e7c7b0ab65fd5ece7c28e7171c7ecbe8dfec25':
Add __gnuc_va_list in stdio.h to stop gcc from generating include-fixed/stdio.h
2014-09-08 02:42:13 +00:00
Andrew Hsieh
289d24e09a
am fb7bcce6: Merge "Add back arc4random_stir for 32-bit android-L"
...
* commit 'fb7bcce68a2a1567410cfa0c800fe8568e037641':
Add back arc4random_stir for 32-bit android-L
2014-09-08 02:42:12 +00:00
Andrew Hsieh
d715bffe04
Merge "Fixed atexit()"
2014-09-08 02:37:17 +00:00