OSDN Git Service
Sean Wan [Fri, 19 Sep 2014 21:49:11 +0000 (21:49 +0000)]
am
3c648e37: Update comment to use correct GPS file for wearable.
* commit '
3c648e373a44237c1924fc886daf8418a6e9f4cf':
Update comment to use correct GPS file for wearable.
Sean Wan [Fri, 19 Sep 2014 21:33:51 +0000 (14:33 -0700)]
Update comment to use correct GPS file for wearable.
Change-Id: I91c4363dbcc6cada8d6e9599d1b15e77febee0e5
Vinod Krishnan [Thu, 4 Sep 2014 23:11:58 +0000 (23:11 +0000)]
am
8c967b9b: DO NOT MERGE: Removing android prefix for ECG feature
* commit '
8c967b9bea7c80a8bd7d085fa9c9e390495dd1e8':
DO NOT MERGE: Removing android prefix for ECG feature
Vinod Krishnan [Thu, 4 Sep 2014 22:24:12 +0000 (15:24 -0700)]
DO NOT MERGE: Removing android prefix for ECG feature
Bug:
17272904
Change-Id: Ia476bd8853e098600b681bb769536774596b9345
Jesse Hall [Wed, 20 Aug 2014 19:52:40 +0000 (19:52 +0000)]
am
c3d1889e: Merge "surfaceflinger: skip composition for empty frames" into klp-modular-dev
* commit '
c3d1889e508038efe240ed1974ed377a2e12835c':
surfaceflinger: skip composition for empty frames
Vinod Krishnan [Wed, 20 Aug 2014 18:18:32 +0000 (18:18 +0000)]
am
1f1ca890: Adding an ECG hardware feature
* commit '
1f1ca890d4d82cd8d54d428c3120945a0a308975':
Adding an ECG hardware feature
Vinod Krishnan [Tue, 19 Aug 2014 18:40:36 +0000 (11:40 -0700)]
Adding an ECG hardware feature
Change-Id: I368772d4cd6b2713fb5180bedc91bf2b5bc015b4
Jesse Hall [Wed, 20 Aug 2014 19:42:34 +0000 (19:42 +0000)]
Merge "surfaceflinger: skip composition for empty frames" into klp-modular-dev
Jesse Hall [Thu, 14 Aug 2014 22:45:06 +0000 (15:45 -0700)]
surfaceflinger: skip composition for empty frames
By not committing the results of composition for empty frames, we
avoid spitting out series of black frames for virtual displays that
don't have visible layers. We still draw one black frame when going
from having layers to not having any. In particular, this avoids
having a series of empty frames due to re-compositing the primary
display in the period between creating the virtual display and adding
layers to it.
Bug:
16786752
Change-Id: I7e9b2ed2e407d8d49c7af736b447d4c6181b0ad8
Robin Lee [Wed, 9 Jul 2014 17:31:58 +0000 (17:31 +0000)]
am
7c5be65f: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
* commit '
7c5be65f2819bf0328715bc405483788dd7a81f2':
Rename 'mkuser' command to 'mkuserconfig'
Brian Carlstrom [Wed, 9 Jul 2014 12:36:58 +0000 (12:36 +0000)]
am
cbb9d0d7: Merge "Make dex2oat heap size product configurable [frameworks/native]"
* commit '
cbb9d0d74008e460963a3c3094f654c50a04a295':
Make dex2oat heap size product configurable [frameworks/native]
Sreeram Ramachandran [Wed, 9 Jul 2014 00:13:15 +0000 (00:13 +0000)]
am
0d2bee0c: Merge "Dump all the correct routing tables."
* commit '
0d2bee0c0baec56ec98867d7e044602097525248':
Dump all the correct routing tables.
Nick Kralevich [Mon, 7 Jul 2014 23:09:27 +0000 (23:09 +0000)]
am
f9cfae24: Merge "Remove inline access control in service_manager."
* commit '
f9cfae24123bae199a07bee2dd1c307906c6e6d0':
Remove inline access control in service_manager.
Brian Carlstrom [Wed, 9 Jul 2014 04:07:54 +0000 (04:07 +0000)]
Merge "Make dex2oat heap size product configurable [frameworks/native]"
Brian Carlstrom [Fri, 27 Jun 2014 23:03:06 +0000 (16:03 -0700)]
Make dex2oat heap size product configurable [frameworks/native]
Bug:
15919420
Change-Id: I0e629ff4f7541f0dde7380e0dbc8dab1c13df7bd
Sreeram Ramachandran [Wed, 9 Jul 2014 00:03:35 +0000 (00:03 +0000)]
Merge "Dump all the correct routing tables."
Sreeram Ramachandran [Tue, 8 Jul 2014 22:40:55 +0000 (15:40 -0700)]
Dump all the correct routing tables.
The list of tables is maintained in /data/misc/net/rt_tables by netd.
Change-Id: I55475c08c5e43bcf61af916210e680c47480ac32
Robin Lee [Wed, 9 Jul 2014 17:27:09 +0000 (17:27 +0000)]
Merge "Rename 'mkuser' command to 'mkuserconfig'"
Nick Kralevich [Mon, 7 Jul 2014 22:59:00 +0000 (22:59 +0000)]
Merge "Remove inline access control in service_manager."
Brian Carlstrom [Fri, 27 Jun 2014 23:02:11 +0000 (23:02 +0000)]
am
a5726eb9: Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"
* commit '
a5726eb954588bd27ffa55a5193e7c0f8bd9eac3':
Use current max product dalvik.vm.heapsize as default dex2oat heap size
Riley Spahn [Wed, 25 Jun 2014 22:15:21 +0000 (15:15 -0700)]
Remove inline access control in service_manager.
Remove the hardcoded tuples of UIDs and the services that
each is allowed to register. We will rely only on permissions
from SELinux.
Change-Id: I1c44555a6e274814282398865b30ee938f40dabb
Brian Carlstrom [Fri, 27 Jun 2014 22:50:18 +0000 (22:50 +0000)]
Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"
Brian Carlstrom [Fri, 27 Jun 2014 21:15:19 +0000 (14:15 -0700)]
Use current max product dalvik.vm.heapsize as default dex2oat heap size
Bug:
15919420
(cherry picked from commit
3aa138617b42b87069dbac0b441bd14dca2d8609)
Change-Id: I569ba111c6163e94dd1b09b21ef374f05d263e72
Narayan Kamath [Tue, 24 Jun 2014 12:13:30 +0000 (12:13 +0000)]
am
357df19b: Merge "Exclude subdirectories when pruning the dex cache."
* commit '
357df19b14b8387a480ed68dd6ea92eeb1aa4edc':
Exclude subdirectories when pruning the dex cache.
Narayan Kamath [Tue, 24 Jun 2014 12:07:36 +0000 (12:07 +0000)]
Merge "Exclude subdirectories when pruning the dex cache."
Narayan Kamath [Tue, 17 Jun 2014 11:54:16 +0000 (12:54 +0100)]
Exclude subdirectories when pruning the dex cache.
This requires a companion package manager change to prune
each instruction specific dex cache individually.
bug:
15677279
Change-Id: I5891981512bde20e49bff65b1842c28886f2b177
Brian Carlstrom [Tue, 17 Jun 2014 20:00:17 +0000 (20:00 +0000)]
am
71f9956a: Merge "Fix obsolete argument name"
* commit '
71f9956a23885e64626828a1afa8c512e29be8cc':
Fix obsolete argument name
Brian Carlstrom [Tue, 17 Jun 2014 19:51:37 +0000 (19:51 +0000)]
Merge "Fix obsolete argument name"
Brian Carlstrom [Mon, 16 Jun 2014 20:28:03 +0000 (13:28 -0700)]
Fix obsolete argument name
Change-Id: I8030f055ee49dc86d4592f36791edddfc0d60a31
Narayan Kamath [Mon, 16 Jun 2014 13:28:01 +0000 (13:28 +0000)]
am
8c9bcff8: Merge "Add an installd command to prune dex files."
* commit '
8c9bcff892ae30897a971c3b97305e70db5b5bd3':
Add an installd command to prune dex files.
Narayan Kamath [Fri, 13 Jun 2014 10:22:29 +0000 (10:22 +0000)]
am
ece62384: Merge "Remove Parcel::writeIntPtr."
* commit '
ece6238488207bd20cc4d32fda90514ebf461206':
Remove Parcel::writeIntPtr.
Nick Kralevich [Thu, 12 Jun 2014 23:12:43 +0000 (23:12 +0000)]
am
3dd3de03: Merge "installd: change profile files to 0660"
* commit '
3dd3de03de17546d785ed2a741fc645c1a0fcad5':
installd: change profile files to 0660
Nick Kralevich [Thu, 12 Jun 2014 21:06:37 +0000 (21:06 +0000)]
am
18c9394c: Merge "Add SELinux checks when adding a service."
* commit '
18c9394ce1a4869eb5cf91eece02a4e944e2eebc':
Add SELinux checks when adding a service.
Mark Salyzyn [Thu, 12 Jun 2014 16:09:59 +0000 (16:09 +0000)]
am
a4e345e1: Merge "sensorservice: 64-bit compile issues"
* commit '
a4e345e169fd9101011e358abdfb9308bc065bdb':
sensorservice: 64-bit compile issues
Nick Kralevich [Thu, 12 Jun 2014 21:00:42 +0000 (21:00 +0000)]
Merge "Add SELinux checks when adding a service."
Riley Spahn [Thu, 5 Jun 2014 18:07:18 +0000 (11:07 -0700)]
Add SELinux checks when adding a service.
Add a MAC check to the svc_can_register function in
service_manager. The types are defined in
external/sepolicy/service.te and the mapping from service
names is defined in external/sepolicy/service_contexts.
Currently uses the property context backend to parse the
contexts file.
Bug:
12909011
Change-Id: I5d90a614263c60571c7c70c2882e6fa929911ca5
Mark Salyzyn [Thu, 12 Jun 2014 16:03:00 +0000 (16:03 +0000)]
Merge "sensorservice: 64-bit compile issues"
Wengang Wu [Wed, 11 Jun 2014 18:17:19 +0000 (18:17 +0000)]
am
e3d37a7b: Enable support RGBX_8888 for omap3
* commit '
e3d37a7b55f86f5d005dd67f828dcf51fe60c0f6':
Enable support RGBX_8888 for omap3
Wengang Wu [Fri, 6 Jun 2014 21:32:15 +0000 (16:32 -0500)]
Enable support RGBX_8888 for omap3
Bug:
14995811
Change-Id: Iaeb5a5ad0e3bcf215613f24f2570ae0d8267c016
Calin Juravle [Wed, 11 Jun 2014 08:53:49 +0000 (08:53 +0000)]
am
7281ca65: Merge "Pass --top-k-profile-threshold to dex2oat if available."
* commit '
7281ca65d00171b846497abca357a005a401e16b':
Pass --top-k-profile-threshold to dex2oat if available.
Mark Salyzyn [Tue, 10 Jun 2014 21:50:02 +0000 (14:50 -0700)]
sensorservice: 64-bit compile issues
Change-Id: Ied7b779f39e71d041791729f7355b052b63903c5
Nick Kralevich [Thu, 12 Jun 2014 23:05:09 +0000 (23:05 +0000)]
Merge "installd: change profile files to 0660"
Nick Kralevich [Thu, 12 Jun 2014 01:23:59 +0000 (18:23 -0700)]
installd: change profile files to 0660
Profiling information leaks data about how people interact
with apps, so we don't want the data to be available
to other apps. Only the app and system_server need access.
Don't create the /data/dalvik-cache/profiles directory. init.rc
does it for us now.
Change-Id: Ic1b44009faa30d704855e97631006c4b990a4ad3
Narayan Kamath [Mon, 16 Jun 2014 13:19:11 +0000 (13:19 +0000)]
Merge "Add an installd command to prune dex files."
Calin Juravle [Wed, 11 Jun 2014 08:45:16 +0000 (08:45 +0000)]
Merge "Pass --top-k-profile-threshold to dex2oat if available."
Narayan Kamath [Fri, 13 Jun 2014 09:29:23 +0000 (09:29 +0000)]
Merge "Remove Parcel::writeIntPtr."
Narayan Kamath [Thu, 12 Jun 2014 14:24:06 +0000 (15:24 +0100)]
Remove Parcel::writeIntPtr.
All uses of this API have been removed. It should
never have been made public in the first place.
bug:
15424960
(cherry picked from commit
7da40c0a84dd89e92201448dd5ed3387dc94df2b)
Change-Id: I8d89f62dbdaee7149ef908e0c97417b85e0c48a2
Robin Lee [Tue, 10 Jun 2014 17:46:26 +0000 (18:46 +0100)]
Rename 'mkuser' command to 'mkuserconfig'
Brings the name more in line with what it actually does.
Change-Id: I0adb14deb1a035abdbe51714356bd0c94ccf04c5
Narayan Kamath [Tue, 10 Jun 2014 12:16:47 +0000 (13:16 +0100)]
Add an installd command to prune dex files.
This is a straightforward port of logic from
PackageManagerService#pruneDexFiles.
bug:
14407732
Change-Id: I892cff027ddcbb1a4fb37a7af5ecf1697049a188
Calin Juravle [Fri, 6 Jun 2014 15:58:43 +0000 (16:58 +0100)]
Pass --top-k-profile-threshold to dex2oat if available.
Also, don't pass --profile-file if the file is empty.
Bug:
12877748
Change-Id: I587d198e64da709930e2cea50a87fed1525281e5
Ying Wang [Mon, 9 Jun 2014 23:00:04 +0000 (23:00 +0000)]
am
d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."
* commit '
d284c4cd78e0d42a8ee7af6e8f61c5e66cae6318':
Don't set LOCAL_MODULE_PATH for native tests.
Ying Wang [Mon, 9 Jun 2014 22:52:48 +0000 (22:52 +0000)]
Merge "Don't set LOCAL_MODULE_PATH for native tests."
Ying Wang [Mon, 9 Jun 2014 22:23:46 +0000 (15:23 -0700)]
Don't set LOCAL_MODULE_PATH for native tests.
The build system will set it up automatically.
Change-Id: Id5ed9eff88dab2349c3b357ee09f7da9479d7d2d
Mark Salyzyn [Mon, 9 Jun 2014 21:46:25 +0000 (21:46 +0000)]
am
0e1313cd: Merge "libgui: 64-bit compile issues"
* commit '
0e1313cdb1d5d21e4d6123f77b4238f1c8c2d564':
libgui: 64-bit compile issues
Mark Salyzyn [Mon, 9 Jun 2014 21:38:00 +0000 (21:38 +0000)]
Merge "libgui: 64-bit compile issues"
Mark Salyzyn [Mon, 9 Jun 2014 21:27:45 +0000 (14:27 -0700)]
libgui: 64-bit compile issues
Change-Id: I29961c1567b8431518a7d032ea43385e23b7bb37
Robin Lee [Mon, 9 Jun 2014 12:51:06 +0000 (12:51 +0000)]
am
c4193f1f: Merge "Migrate keychain directories to /data/misc/user/0"
* commit '
c4193f1fef52314b451f55cce48ce44f94b875b6':
Migrate keychain directories to /data/misc/user/0
Robin Lee [Mon, 9 Jun 2014 12:44:33 +0000 (12:44 +0000)]
Merge "Migrate keychain directories to /data/misc/user/0"
Calin Juravle [Mon, 9 Jun 2014 09:56:31 +0000 (09:56 +0000)]
am
06642342: Merge "Don\'t always add profile-file option to dex2oat"
* commit '
066423423f04bf1c5972b1d611e01e2e17df3727':
Don't always add profile-file option to dex2oat
Calin Juravle [Mon, 9 Jun 2014 09:15:09 +0000 (09:15 +0000)]
Merge "Don't always add profile-file option to dex2oat"
Jesse Hall [Sat, 7 Jun 2014 00:16:33 +0000 (00:16 +0000)]
am
6fa169fa: Merge "Add aarch64 EGL/GLES trampolines"
* commit '
6fa169faa955ecc47872557a5d4fd89a95190d5e':
Add aarch64 EGL/GLES trampolines
Jesse Hall [Fri, 6 Jun 2014 23:49:40 +0000 (23:49 +0000)]
Merge "Add aarch64 EGL/GLES trampolines"
Jesse Hall [Sat, 31 May 2014 06:32:12 +0000 (23:32 -0700)]
Add aarch64 EGL/GLES trampolines
Change-Id: Ia90e18d26ff3bdb7e643aff8d77cbaddd2ac2a03
Calin Juravle [Fri, 6 Jun 2014 13:42:16 +0000 (14:42 +0100)]
Don't always add profile-file option to dex2oat
Add profile-file option to dex2oat only if the profiler is active and
the file exists.
Bug:
12877748
Bug:
15275634
Change-Id: Icef76514c912c88311ed108f2be7a6329131f741
Narayan Kamath [Fri, 6 Jun 2014 10:33:18 +0000 (10:33 +0000)]
am
e86420e3: (-s ours) Merge "Fix flattening/unflattening of android::Sensor."
* commit '
e86420e399993e0f49e5d7733b5fc87eb9fe179b':
Fix flattening/unflattening of android::Sensor.
Narayan Kamath [Fri, 6 Jun 2014 10:05:08 +0000 (10:05 +0000)]
Merge "Fix flattening/unflattening of android::Sensor."
Robin Lee [Thu, 5 Jun 2014 17:53:31 +0000 (17:53 +0000)]
am
8adb5a82: Merge "Add installd command to create /data/misc user dir"
* commit '
8adb5a822d44ed43aa0ec9a8948a7820fdfcd375':
Add installd command to create /data/misc user dir
Robin Lee [Tue, 29 Apr 2014 18:42:01 +0000 (19:42 +0100)]
Migrate keychain directories to /data/misc/user/0
With new CA certificates being stored in /data/misc/user/<userid>/
existing ones need to be moved into the same place.
After this update only the owner user will have custom trusted CAs; all
other users will revert to the default set.
Change-Id: I14a4cd6048685902ad5dd3b53494b03fadc41c04
Robin Lee [Thu, 5 Jun 2014 17:18:23 +0000 (17:18 +0000)]
Merge "Add installd command to create /data/misc user dir"
Robin Lee [Fri, 25 Apr 2014 14:05:19 +0000 (15:05 +0100)]
Add installd command to create /data/misc user dir
New command 'mkuser <id>' sets up a user directory in /data/misc/user/,
readable by all apps within that user and writeable by the local system
process.
Change-Id: I5ddde8c4a80f606e723bb41aa64581a0720842d5
Narayan Kamath [Wed, 4 Jun 2014 17:28:38 +0000 (17:28 +0000)]
am
065e9c86: Merge "Fix mips build for libbinder."
* commit '
065e9c86e249beac08783c7e9334d5709e2c9080':
Fix mips build for libbinder.
Narayan Kamath [Wed, 4 Jun 2014 14:53:08 +0000 (14:53 +0000)]
Merge "Fix mips build for libbinder."
Narayan Kamath [Wed, 4 Jun 2014 14:04:29 +0000 (15:04 +0100)]
Fix mips build for libbinder.
Mips specific code was using an uninitialized variable.
(cherry picked from commit
2c68d380c9ef765a7d46e5a4735f39e6c27849f2)
Change-Id: I6b562b3f6d2084b72e747736cbf43684c2049f8e
Mark Salyzyn [Tue, 3 Jun 2014 20:48:35 +0000 (20:48 +0000)]
am
a28750ee: Merge "binder: Turn on -Werror"
* commit '
a28750eec38c848230adfeef28725b29cc36a9da':
binder: Turn on -Werror
Mark Salyzyn [Tue, 3 Jun 2014 19:40:00 +0000 (19:40 +0000)]
Merge "binder: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 23:35:57 +0000 (16:35 -0700)]
binder: Turn on -Werror
Change-Id: I0ee785927a7ae5f731b02176b0b781b87c22a24e
Narayan Kamath [Tue, 3 Jun 2014 13:29:00 +0000 (13:29 +0000)]
am
f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
* commit '
f1dd859baa114995bcbcfb7119e939d0b4f45ed5':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
Narayan Kamath [Tue, 3 Jun 2014 10:06:55 +0000 (10:06 +0000)]
Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
Narayan Kamath [Fri, 30 May 2014 13:40:13 +0000 (14:40 +0100)]
Fix flattening/unflattening of android::Sensor.
Write string lengths as uint32_t so that their width is
the same on 32 and 64 bit processes.
Note that this fixes another bug as a side effect; getFlattenedSize
was assuming that sizeof(uint32_t) == sizeof(size_t).
Change-Id: I7b6e3993e1f1ac45c14832ce59c59e0772855a2f
Fengwei Yin [Fri, 23 May 2014 21:32:09 +0000 (05:32 +0800)]
x86_64: Align uint64_t/int64_t structure member to 8 bytes
To make sure the stature which pass between 32/64bit process have
same memory layout for 32/64bit.
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.)
Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
Mark Salyzyn [Thu, 29 May 2014 21:06:36 +0000 (21:06 +0000)]
am
1ce5ecbe: am
63645c69: Merge "binder: rm utils/Debug.h"
* commit '
1ce5ecbe3286380f5ff7ace289369ed006e9b40a':
binder: rm utils/Debug.h
Mark Salyzyn [Thu, 29 May 2014 20:29:32 +0000 (20:29 +0000)]
am
63645c69: Merge "binder: rm utils/Debug.h"
* commit '
63645c69e03cf3862c52cfde6cbd5f5143ccd38a':
binder: rm utils/Debug.h
Mark Salyzyn [Thu, 29 May 2014 20:26:48 +0000 (20:26 +0000)]
Merge "binder: rm utils/Debug.h"
Mark Salyzyn [Thu, 29 May 2014 20:09:22 +0000 (13:09 -0700)]
binder: rm utils/Debug.h
Change-Id: I16931919a26c16a0d701771c93fa7fe1c6f60ef8
Brian Carlstrom [Thu, 29 May 2014 19:43:02 +0000 (19:43 +0000)]
am
4ae6a267: am
f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
4ae6a26719feb21b7fa1cc5f307b591858a30f26':
Remove dependencies on runtime_libdvm and libdvm.so in general
Brian Carlstrom [Thu, 29 May 2014 19:39:48 +0000 (19:39 +0000)]
am
f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
f3e4fda09106cb93bddea35a2cc7dbd4b2c281e9':
Remove dependencies on runtime_libdvm and libdvm.so in general
Brian Carlstrom [Thu, 29 May 2014 19:36:41 +0000 (19:36 +0000)]
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
Simon Wilson [Thu, 29 May 2014 17:54:34 +0000 (17:54 +0000)]
am
90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too"
* commit '
90654afb3aeac78916f2a53fe689a087c0e283c9':
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
(cherry picked from commit
aefe55f0fb9e69be205497ef4fc3432d2f7a2d8b)
Change-Id: I05b1a7dd1ef30b3366b52b46bfc7b39cfb3be198
Simon Wilson [Thu, 29 May 2014 15:49:51 +0000 (08:49 -0700)]
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
Since the new TI SGX DDK 1.12 has fixed support for RGBA8888,
the workaround can be reverted. This may help with CTS issues.
Bug:
14995811
This reverts commit
6e79cb81d02984c9f7ac0586078f947c94c56c2a.
Change-Id: Id8160ebe577d7009d2dd5eb4501ec40356a4274d
Elliott Hughes [Thu, 29 May 2014 01:04:28 +0000 (01:04 +0000)]
am
259c2508: am
03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '
259c25080d8b7f3b66e27e4d8ac3a268738ebe3f':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Thu, 29 May 2014 01:02:16 +0000 (01:02 +0000)]
am
03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '
03e2f8fa13a791d744758ec9ffe27f52cab730d0':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Thu, 29 May 2014 00:59:01 +0000 (00:59 +0000)]
Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
Brian Carlstrom [Wed, 28 May 2014 23:13:27 +0000 (23:13 +0000)]
am
e67810fd: am
97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
e67810fd7a00ffa92337c6f3aa6114136ce12613':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:31:43 +0000 (22:31 +0000)]
am
97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
97a51ad44ae3dcf4976076382923ddcae16233ee':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:41 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
c4ac3124ffb51f13bb4206e9f8452a3712eb09cb)
Change-Id: I97cc3ff7a269e671b315afa8673dae43d1f86bf1
Brigid Smith [Wed, 28 May 2014 21:23:24 +0000 (14:23 -0700)]
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Bug:
15116468
Change-Id: I621532fb53b8317f5a513edfbeb0c50c265342fc
Jesse Hall [Tue, 27 May 2014 23:31:32 +0000 (23:31 +0000)]
am
618c78c0: am
dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
* commit '
618c78c032ce84c02724a1e5a7f439fa788ecf3a':
EGL: add x86/64 assembly code for EGL/GLES wrappers
Jesse Hall [Tue, 27 May 2014 23:29:20 +0000 (23:29 +0000)]
am
dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
* commit '
dc2736219fa897840d1ff12b11cd7defb636f845':
EGL: add x86/64 assembly code for EGL/GLES wrappers
OSDN Git Service
