OSDN Git Service
Sami Tolvanen [Thu, 17 Sep 2015 20:00:02 +0000 (20:00 +0000)]
am
6e2a82fc: am
7f6d7449: am
510ade28: Merge "boot_signer: allow verification using an external certificate"
* commit '
6e2a82fc0bb68b5988a57d1e9b951e084f1a319e':
boot_signer: allow verification using an external certificate
Sami Tolvanen [Thu, 17 Sep 2015 10:44:09 +0000 (10:44 +0000)]
am
7f6d7449: am
510ade28: Merge "boot_signer: allow verification using an external certificate"
* commit '
7f6d74497435cb71a676e8fccf17edec864d16bc':
boot_signer: allow verification using an external certificate
Sami Tolvanen [Thu, 17 Sep 2015 10:38:20 +0000 (10:38 +0000)]
am
510ade28: Merge "boot_signer: allow verification using an external certificate"
* commit '
510ade28faa0a940965dc2d379c42fa45cdea395':
boot_signer: allow verification using an external certificate
Sami Tolvanen [Thu, 17 Sep 2015 10:31:11 +0000 (10:31 +0000)]
Merge "boot_signer: allow verification using an external certificate"
Christopher Ferris [Wed, 16 Sep 2015 00:05:21 +0000 (00:05 +0000)]
am
8845c21b: am
c43a3c59: am
35a68e69: Merge "Fix mac build."
* commit '
8845c21b773b6934b3f132dae11545df68531fee':
Fix mac build.
Christopher Ferris [Tue, 15 Sep 2015 23:58:58 +0000 (23:58 +0000)]
am
c43a3c59: am
35a68e69: Merge "Fix mac build."
* commit '
c43a3c59c45cef7711d073f022cae6400a0043a9':
Fix mac build.
Christopher Ferris [Tue, 15 Sep 2015 23:47:24 +0000 (23:47 +0000)]
am
35a68e69: Merge "Fix mac build."
* commit '
35a68e69ce08e2d6c2c4696330b0cf918e167559':
Fix mac build.
Christopher Ferris [Tue, 15 Sep 2015 23:41:29 +0000 (23:41 +0000)]
am
aa43d1ad: am
e82b95bb: am
168437c1: Merge "Tool to replay memory allocation recordings."
* commit '
aa43d1adb104ee5a9f27683f02a6620a747bd3a3':
Tool to replay memory allocation recordings.
Christopher Ferris [Tue, 15 Sep 2015 23:29:05 +0000 (23:29 +0000)]
Merge "Fix mac build."
Christopher Ferris [Tue, 15 Sep 2015 23:26:21 +0000 (16:26 -0700)]
Fix mac build.
This disables the host code and host tests on anything but a linux
system.
Change-Id: I1a6396707df216e1c22de537072b10221fcc7fce
Christopher Ferris [Tue, 15 Sep 2015 23:21:45 +0000 (23:21 +0000)]
am
e82b95bb: am
168437c1: Merge "Tool to replay memory allocation recordings."
* commit '
e82b95bbc0351fcad0a03d54b4467c6844114a23':
Tool to replay memory allocation recordings.
Christopher Ferris [Tue, 15 Sep 2015 23:15:55 +0000 (23:15 +0000)]
am
168437c1: Merge "Tool to replay memory allocation recordings."
* commit '
168437c1ae6cd7fcbad344582efd6a5cfe660ff0':
Tool to replay memory allocation recordings.
Christopher Ferris [Tue, 15 Sep 2015 23:04:08 +0000 (23:04 +0000)]
Merge "Tool to replay memory allocation recordings."
Gopinath [Tue, 15 Sep 2015 22:30:09 +0000 (22:30 +0000)]
Gopinath [Tue, 15 Sep 2015 21:43:56 +0000 (21:43 +0000)]
Christopher Ferris [Fri, 11 Sep 2015 22:34:23 +0000 (15:34 -0700)]
Tool to replay memory allocation recordings.
Included with the tool are a set of app memory recordings that
can be used to judge the abilities of the native memory
allocator.
Verified the full flow by running valgrind on the host version on all
the current dumps and verifying that there are no leak, and no errors.
Change-Id: I756224991f04b61ba26c692a30a37aad0c9fb163
Gopinath [Tue, 15 Sep 2015 21:22:52 +0000 (21:22 +0000)]
Gopinath [Tue, 15 Sep 2015 20:05:35 +0000 (20:05 +0000)]
Gopinath [Tue, 15 Sep 2015 18:27:13 +0000 (11:27 -0700)]
64bit emmc fix
Generating both 32bit and 64bit varaints for emmc
Change-Id: Iefb38576fc6a2c516b13f10e24828b373410d942
Sami Tolvanen [Tue, 15 Sep 2015 09:41:16 +0000 (10:41 +0100)]
boot_signer: allow verification using an external certificate
Add a -certificate parameter, which allows one to specify an external
public key certificate to use for verifying boot image signatures:
boot_signer -verify boot.img -certificate cert.x509.pem
This makes it possible to confirm that the boot image has been signed
with a specific key.
Change-Id: I41f1a05e1c8be3bfac2a86678d81beaae0e371bb
Colin Cross [Mon, 14 Sep 2015 18:18:04 +0000 (18:18 +0000)]
am
3ea857a9: am
a2b08988: am
12f454e2: Merge changes I7dc2edd4,I419b2ec0
* commit '
3ea857a936e0c0fd293abcf8a43b2cdfbe718b02':
iotop: add total read/write stats
iotop: fix bytes per second, and add accumulation
Colin Cross [Mon, 14 Sep 2015 18:10:13 +0000 (18:10 +0000)]
am
a2b08988: am
12f454e2: Merge changes I7dc2edd4,I419b2ec0
* commit '
a2b089889231d3347e3db59cd89afa0fe99f1ee4':
iotop: add total read/write stats
iotop: fix bytes per second, and add accumulation
Colin Cross [Mon, 14 Sep 2015 18:03:04 +0000 (18:03 +0000)]
am
12f454e2: Merge changes I7dc2edd4,I419b2ec0
* commit '
12f454e24a518d81fe42043b7142582b81694363':
iotop: add total read/write stats
iotop: fix bytes per second, and add accumulation
Colin Cross [Mon, 14 Sep 2015 17:55:58 +0000 (17:55 +0000)]
Merge changes I7dc2edd4,I419b2ec0
* changes:
iotop: add total read/write stats
iotop: fix bytes per second, and add accumulation
Ying Wang [Wed, 9 Sep 2015 17:46:37 +0000 (17:46 +0000)]
Merge "Fix multilib build."
Ying Wang [Wed, 9 Sep 2015 17:26:59 +0000 (10:26 -0700)]
Fix multilib build.
Change-Id: Ia19bff5f585d7fc685ed878391687cc3a4198a52
Theodore Ts'o [Wed, 9 Sep 2015 16:26:53 +0000 (12:26 -0400)]
make_ext4fs: Don't set EXT4_BG_INODE_UNINIT for now
Since we aren't setting the EXT4_FEATURE_RO_COMPAT_GDT_CSUM flag due to
commit
eee96f654e7a3, we also must not set the EXT4_BG_INODE_UNINIT
flag.
Bug:
23786458
Change-Id: I2ad3196156013426c96f48d4675819cd4f1b5711
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Than McIntosh [Wed, 9 Sep 2015 15:40:26 +0000 (15:40 +0000)]
am
38fe1f22: am
10e4a8d5: am
59d3e1db: Merge "Support for additional profile annotations."
* commit '
38fe1f22b544eaf0402dbc5c03ca2390f2d2440e':
Support for additional profile annotations.
Than McIntosh [Wed, 9 Sep 2015 15:33:54 +0000 (15:33 +0000)]
am
10e4a8d5: am
59d3e1db: Merge "Support for additional profile annotations."
* commit '
10e4a8d50bf7822c591731b55b63b201cbffc196':
Support for additional profile annotations.
Than McIntosh [Wed, 9 Sep 2015 15:25:27 +0000 (15:25 +0000)]
am
59d3e1db: Merge "Support for additional profile annotations."
* commit '
59d3e1db25839547fc7e713d3c86d3329833aabc':
Support for additional profile annotations.
Than McIntosh [Wed, 9 Sep 2015 15:20:17 +0000 (15:20 +0000)]
Merge "Support for additional profile annotations."
Colin Cross [Wed, 9 Sep 2015 00:09:22 +0000 (17:09 -0700)]
iotop: add total read/write stats
Provide total read, write, and read/write stats across all threads
or processes.
Change-Id: I7dc2edd45681b6a54f67347337c76deb1342dc95
Colin Cross [Tue, 8 Sep 2015 22:04:22 +0000 (15:04 -0700)]
iotop: fix bytes per second, and add accumulation
Bytes per second forgot to divide bytes by seconds. Also add
the -a flag to print bytes instead of bytes per second.
Change-Id: I419b2ec0f702a291d299fe736d2d4ab290c03445
David Zeuthen [Tue, 8 Sep 2015 19:26:05 +0000 (19:26 +0000)]
am
b1ed497d: am
90987ecc: am
bd827df0: Merge "boot_control_copy: A boot_control HAL implementation that works by copying."
* commit '
b1ed497d2bbd36d0bd82d1dcaea851f9afa8b3c9':
boot_control_copy: A boot_control HAL implementation that works by copying.
David Zeuthen [Tue, 8 Sep 2015 19:20:22 +0000 (19:20 +0000)]
am
90987ecc: am
bd827df0: Merge "boot_control_copy: A boot_control HAL implementation that works by copying."
* commit '
90987ecce1e11fb322d663e816c43ff889400cab':
boot_control_copy: A boot_control HAL implementation that works by copying.
David Zeuthen [Tue, 8 Sep 2015 19:14:30 +0000 (19:14 +0000)]
am
bd827df0: Merge "boot_control_copy: A boot_control HAL implementation that works by copying."
* commit '
bd827df07c44464767c45da538294d42a1a0c103':
boot_control_copy: A boot_control HAL implementation that works by copying.
David Zeuthen [Tue, 8 Sep 2015 19:09:04 +0000 (19:09 +0000)]
Merge "boot_control_copy: A boot_control HAL implementation that works by copying."
Than McIntosh [Thu, 3 Sep 2015 19:16:04 +0000 (15:16 -0400)]
Support for additional profile annotations.
Includes "device booting", "on charger", and cpu utilization.
Prototype version of "camera active" (not yet enabled). Also in
this patch, separate out the code to read perfprofd's config
file and place into a separate source file.
Change-Id: I04d65c406fd41f26a509983f08658991e8f1d422
Lorenzo Colitti [Mon, 7 Sep 2015 01:56:18 +0000 (01:56 +0000)]
am
72fd5af7: am
47110a49: am
a2b2d811: Merge "Annotate a few tests with the relevant kernel commits."
* commit '
72fd5af75d167ed89f53c0c6e29b420ee01ba595':
Annotate a few tests with the relevant kernel commits.
Lorenzo Colitti [Mon, 7 Sep 2015 01:50:28 +0000 (01:50 +0000)]
am
47110a49: am
a2b2d811: Merge "Annotate a few tests with the relevant kernel commits."
* commit '
47110a492ae81d58020b12298d3ee1997bfe17d5':
Annotate a few tests with the relevant kernel commits.
Colin Cross [Sun, 6 Sep 2015 23:10:26 +0000 (23:10 +0000)]
am
d242ec7b: am
21054c64: am
a0370d7b: Merge "Implement iotop"
* commit '
d242ec7b376e936435aa9936f9d9166711645c2a':
Implement iotop
Lorenzo Colitti [Sun, 6 Sep 2015 11:17:39 +0000 (11:17 +0000)]
am
a2b2d811: Merge "Annotate a few tests with the relevant kernel commits."
* commit '
a2b2d8119cb8a3377ad3addc2623e56479f6a001':
Annotate a few tests with the relevant kernel commits.
Lorenzo Colitti [Sun, 6 Sep 2015 11:11:58 +0000 (11:11 +0000)]
Merge "Annotate a few tests with the relevant kernel commits."
Colin Cross [Sat, 5 Sep 2015 19:45:34 +0000 (19:45 +0000)]
am
21054c64: am
a0370d7b: Merge "Implement iotop"
* commit '
21054c64206674d130905168df06d2cd9170ac35':
Implement iotop
Colin Cross [Sat, 5 Sep 2015 19:38:42 +0000 (19:38 +0000)]
am
a0370d7b: Merge "Implement iotop"
* commit '
a0370d7bfea440286c3b4df3253e632377ecc326':
Implement iotop
Colin Cross [Sat, 5 Sep 2015 19:31:52 +0000 (19:31 +0000)]
Merge "Implement iotop"
Colin Cross [Fri, 4 Sep 2015 00:56:39 +0000 (17:56 -0700)]
Implement iotop
iotop provides per process statistics on IO rates and kernel delays.
Requires root, and a kernel compiled with CONFIG_TASKSTATS,
CONFIG_TASK_DELAY_ACCT, and CONFIG_TASK_IO_ACCOUNTING.
Change-Id: I111c55a1492e9ea33d8d7b3ab620080625b84346
Filipe Brandenburger [Fri, 4 Sep 2015 14:28:58 +0000 (14:28 +0000)]
am
e9f843fc: am
4e20fc2b: am
b57eb67b: Merge "Expect a notification for NUD_REACHABLE."
* commit '
e9f843fc601ee60d96b439254bd8150ceb73e141':
Expect a notification for NUD_REACHABLE.
Filipe Brandenburger [Fri, 4 Sep 2015 05:57:16 +0000 (05:57 +0000)]
am
4e20fc2b: am
b57eb67b: Merge "Expect a notification for NUD_REACHABLE."
* commit '
4e20fc2b392b3b7b0c48b959e1dec951c46bb3a6':
Expect a notification for NUD_REACHABLE.
Filipe Brandenburger [Fri, 4 Sep 2015 05:48:27 +0000 (05:48 +0000)]
am
b57eb67b: Merge "Expect a notification for NUD_REACHABLE."
* commit '
b57eb67b373f9d2ba27d9ca7d75c27e4c245c687':
Expect a notification for NUD_REACHABLE.
Filipe Brandenburger [Fri, 4 Sep 2015 05:39:35 +0000 (05:39 +0000)]
Merge "Expect a notification for NUD_REACHABLE."
Filipe Brandenburger [Thu, 3 Sep 2015 22:11:13 +0000 (15:11 -0700)]
Expect a notification for NUD_REACHABLE.
This is necessary when running on kernel v3.13+ which includes commit
53385d2 "neigh: Netlink notification for administrative NUD state change"
BUG=chrome-os-partner:43435
TEST=Ran successfully on chromeos-3.18 kernels, android-3.10 unaffected.
Change-Id: I365ba5b8762776156a8a942975286e1c92734277
David Zeuthen [Tue, 1 Sep 2015 18:58:36 +0000 (14:58 -0400)]
boot_control_copy: A boot_control HAL implementation that works by copying.
This boot_control HAL implementation emulates A/B by copying the
contents of the boot partition of the requested slot to the boot
partition. It hence works with bootloaders that are not yet aware of
A/B. This code is only intended to be used for development.
Change-Id: Ifcc1ff19530f9e6db1de882807a25c785e1959de
Lorenzo Colitti [Tue, 1 Sep 2015 04:42:56 +0000 (13:42 +0900)]
Annotate a few tests with the relevant kernel commits.
Also fix a couple of lint warnings, a few spurious newlines, and
a syntax error in currently-unused debug code.
Change-Id: I192eb730d48443ee050ca7702bc3735cd6ff6553
Kenny Root [Thu, 3 Sep 2015 01:00:25 +0000 (01:00 +0000)]
am
7374069c: am
9c8f0965: am
65fd650a: Merge "Prepare for BoringSSL update."
* commit '
7374069c4db655ba6c830e7a2ebf083ad64a144d':
Prepare for BoringSSL update.
Kenny Root [Thu, 3 Sep 2015 00:45:11 +0000 (00:45 +0000)]
am
9c8f0965: am
65fd650a: Merge "Prepare for BoringSSL update."
* commit '
9c8f0965f1af2fedd4423d449089d36f0ce71fab':
Prepare for BoringSSL update.
Kenny Root [Thu, 3 Sep 2015 00:32:23 +0000 (00:32 +0000)]
am
65fd650a: Merge "Prepare for BoringSSL update."
* commit '
65fd650a4ae3d8602bffc0fa469695228209e38b':
Prepare for BoringSSL update.
Kenny Root [Wed, 2 Sep 2015 23:03:30 +0000 (23:03 +0000)]
Merge "Prepare for BoringSSL update."
Adam Langley [Wed, 2 Sep 2015 22:45:12 +0000 (15:45 -0700)]
Prepare for BoringSSL update.
This change tweaks things as needed so that the code will compile
against both the BoringSSL that's currently in Android and a version
from upstream. The BORINGSSL_201509 define is temporary to allow the
switch to happen without breaking the build and a followup change will
remove it.
In this case, we backed off on removing |ERR_print_errors|, despite it
being a wart in the layering of the code.
Change-Id: I2f2f567cfc37fe2d5a69742302c5a92d289b814f
Colin Cross [Wed, 2 Sep 2015 17:56:09 +0000 (17:56 +0000)]
am
47461176: am
2436dd47: am
32802ecf: Merge "Fix taskstats for libnl"
* commit '
47461176b63c7639918955feb2a458f6ec1558ef':
Fix taskstats for libnl
Colin Cross [Wed, 2 Sep 2015 17:47:22 +0000 (17:47 +0000)]
am
2436dd47: am
32802ecf: Merge "Fix taskstats for libnl"
* commit '
2436dd4769130a535bbf112b0d3381c5eeabf6f8':
Fix taskstats for libnl
Colin Cross [Wed, 2 Sep 2015 17:38:18 +0000 (17:38 +0000)]
am
32802ecf: Merge "Fix taskstats for libnl"
* commit '
32802ecf57a6047f7008f9be8ba5072b9d458e57':
Fix taskstats for libnl
Colin Cross [Wed, 2 Sep 2015 17:30:31 +0000 (17:30 +0000)]
Merge "Fix taskstats for libnl"
Colin Cross [Wed, 2 Sep 2015 06:24:13 +0000 (23:24 -0700)]
Fix taskstats for libnl
taskstats doesn't work, probably caused by when I switched it from
using system/core/libnl_2 to external/libnl. Fix a few bugs that
libnl_2 didn't care about:
- callbacks must be registered with NL_CB_CUSTOM
- nla_next is not guaranteed to work if !nla_ok, use nla_for_each_attr
which does the right thing
- instead of fixing get_family_id, use genl_ctrl_resolve
- instead of manually setting pid, seq, and flags, use
nl_send_auto_complete
- since there is now only one command sent, get rid of send_command
and take advantage of the known parameter type to use nla_put_u32
- libnl does not set errno, return nl error codes and use nl_perror
instead of perror
Change-Id: Ic631c8c1d9cc6ed288cbbeb6fe40c45ca5fe9143
David Zeuthen [Tue, 1 Sep 2015 21:06:14 +0000 (21:06 +0000)]
am
cec7a1cf: am
e8d9e9a3: am
d36de04a: Merge "bootctl: Command-line wrapper for boot_control HAL."
* commit '
cec7a1cfba3bfb0bf4ddbd4f4ed3fdef17e10fb3':
bootctl: Command-line wrapper for boot_control HAL.
David Zeuthen [Tue, 1 Sep 2015 20:56:11 +0000 (20:56 +0000)]
am
e8d9e9a3: am
d36de04a: Merge "bootctl: Command-line wrapper for boot_control HAL."
* commit '
e8d9e9a3c2b19aa18758e94ad6b4de7062581c6c':
bootctl: Command-line wrapper for boot_control HAL.
David Zeuthen [Tue, 1 Sep 2015 20:50:12 +0000 (20:50 +0000)]
am
d36de04a: Merge "bootctl: Command-line wrapper for boot_control HAL."
* commit '
d36de04aaa52bb66bf9e4470b7ed4d6cfc88aaeb':
bootctl: Command-line wrapper for boot_control HAL.
David Zeuthen [Tue, 1 Sep 2015 20:42:47 +0000 (20:42 +0000)]
Merge "bootctl: Command-line wrapper for boot_control HAL."
Lorenzo Colitti [Tue, 1 Sep 2015 17:05:30 +0000 (17:05 +0000)]
am
69b3eaab: am
baf9c330: am
3cd19a8a: Merge "Add a millisecond-variant of MonitorSleep."
* commit '
69b3eaab056fc29a893d8b86371006f3a7cf5ce6':
Add a millisecond-variant of MonitorSleep.
Dan Willemsen [Tue, 1 Sep 2015 17:05:29 +0000 (17:05 +0000)]
am
d25eac31: am
9b7b7459: am
b4e51e4e: Merge "Remove HOST_OS checks, whitelist windows module"
* commit '
d25eac313f872a41b59d03dfd5e3e9a9cae2dd3f':
Remove HOST_OS checks, whitelist windows module
Lorenzo Colitti [Tue, 1 Sep 2015 16:50:35 +0000 (16:50 +0000)]
am
baf9c330: am
3cd19a8a: Merge "Add a millisecond-variant of MonitorSleep."
* commit '
baf9c3302abc54ae5348ac55c3ad0b6973d50b99':
Add a millisecond-variant of MonitorSleep.
Dan Willemsen [Tue, 1 Sep 2015 16:50:35 +0000 (16:50 +0000)]
am
9b7b7459: am
b4e51e4e: Merge "Remove HOST_OS checks, whitelist windows module"
* commit '
9b7b745958328a17cdd9ad120f6bd0df7fefdab6':
Remove HOST_OS checks, whitelist windows module
Lorenzo Colitti [Tue, 1 Sep 2015 16:37:46 +0000 (16:37 +0000)]
am
3cd19a8a: Merge "Add a millisecond-variant of MonitorSleep."
* commit '
3cd19a8a924dfd17606247c1f7445765f19a5f25':
Add a millisecond-variant of MonitorSleep.
Dan Willemsen [Tue, 1 Sep 2015 16:37:43 +0000 (16:37 +0000)]
am
b4e51e4e: Merge "Remove HOST_OS checks, whitelist windows module"
* commit '
b4e51e4eeca613d3f1979864ebe4d220f3ee8f10':
Remove HOST_OS checks, whitelist windows module
Lorenzo Colitti [Tue, 1 Sep 2015 10:50:27 +0000 (10:50 +0000)]
Merge "Add a millisecond-variant of MonitorSleep."
Lorenzo Colitti [Tue, 1 Sep 2015 04:42:31 +0000 (13:42 +0900)]
Add a millisecond-variant of MonitorSleep.
This is only used for debugging.
Change-Id: I1e00ff476f99b3a0d30658933f24b5a11ca0710a
Dan Willemsen [Tue, 1 Sep 2015 00:46:48 +0000 (00:46 +0000)]
Merge "Remove HOST_OS checks, whitelist windows module"
David Zeuthen [Mon, 31 Aug 2015 21:55:33 +0000 (17:55 -0400)]
bootctl: Command-line wrapper for boot_control HAL.
Change-Id: Icd7bfee8fcc04ca113c2e6dc8bcefd614e804bb6
John Reck [Mon, 31 Aug 2015 20:50:56 +0000 (20:50 +0000)]
Merge "Tweak binder bench"
Dan Willemsen [Tue, 18 Aug 2015 23:56:12 +0000 (16:56 -0700)]
Remove HOST_OS checks, whitelist windows module
This doesn't remove the HOST_OS checks later in the file, those can be
removed once LOCAL_MODULE_HOST_OS is enforced.
Bug:
23566667
Change-Id: I0032022b470bcc8d5546ed6f8dbd99e3d0cf3db5
Gopinath [Thu, 27 Aug 2015 14:43:13 +0000 (14:43 +0000)]
am
91094615: am
60908399: (-s ours) am
c7d19e4d: Adding 64 bit emmc_rand_perf
* commit '
910946151378254e890f950fcd5d5d3cdedf9da9':
Mark Salyzyn [Thu, 27 Aug 2015 14:43:12 +0000 (14:43 +0000)]
am
66e9cb11: am
27a4f2cd: (-s ours) am
44df7549: Merge "fix bug in mkf2fs tool calculation of f2fs filesystem length"
* commit '
66e9cb11cfd2363186bf22e924a1d76e161c6c11':
Yabin Cui [Thu, 27 Aug 2015 14:43:12 +0000 (14:43 +0000)]
am
c70f75fc: am
cecefed0: (-s ours) am
bea942d7: Merge "Simpleperf: use OneTimeFreeAllocator to allocate symbol names."
* commit '
c70f75fcd6b9a4c6335e233ec043c9c2010d1246':
Yabin Cui [Thu, 27 Aug 2015 14:43:11 +0000 (14:43 +0000)]
am
c9cfbd5e: am
0e4ef2ff: (-s ours) am
bb86cc8c: Merge "Simpleperf: refactor dso."
* commit '
c9cfbd5e9a9cecd3363ef11452b8c36aaade2b55':
Tom Cherry [Thu, 27 Aug 2015 14:43:10 +0000 (14:43 +0000)]
am
d0b9ade9: am
771f012e: (-s ours) am
4c5b176c: Merge "bundle init.rc contents with its service"
* commit '
d0b9ade914cf3b91e30f929e9aa33156ccc39b0e':
Yabin Cui [Thu, 27 Aug 2015 14:43:09 +0000 (14:43 +0000)]
am
72bc5a83: am
0ad1301e: (-s ours) am
68cb694f: Merge "Simpleperf: support multiple event types in record command."
* commit '
72bc5a83d9b1323513a2bceddf271eda368fad3b':
Yabin Cui [Thu, 27 Aug 2015 14:43:08 +0000 (14:43 +0000)]
am
0ced7271: am
b50b2739: (-s ours) am
b84ee6cd: Merge "Simpleperf: improve output of stat command."
* commit '
0ced7271cc165fcef32989a500457d19ba899ccf':
Yabin Cui [Thu, 27 Aug 2015 14:43:07 +0000 (14:43 +0000)]
am
89be437a: am
9dfb0e75: (-s ours) am
5f0c337d: Merge "Simpleperf: add raw data in sample records for tracepoint events."
* commit '
89be437a47b646b4e01a468a80c957fdc5cf380c':
Yusuke Sato [Thu, 27 Aug 2015 14:43:06 +0000 (14:43 +0000)]
am
8c9d1786: am
b44cb476: (-s ours) am
25d34e2a: Merge "Use the new version of android_fork_execvp_ext()"
* commit '
8c9d1786c0da8a38fb087f8acf7c4c832b027151':
Yabin Cui [Thu, 27 Aug 2015 14:43:04 +0000 (14:43 +0000)]
am
b61f09b7: am
f0749467: (-s ours) am
3c599ffc: Merge "Simpleperf: demangle symbols only when necessary."
* commit '
b61f09b798275d8baf010c13ad54fced9134a1a5':
Riley Andrews [Thu, 27 Aug 2015 14:43:04 +0000 (14:43 +0000)]
am
3125605d: am
33a1c1d4: (-s ours) am
2c0f9f26: Merge "Add memcpy perf test + graphing script."
* commit '
3125605d93510b6620019d1303c42a469bd4d4a6':
Andreas Gampe [Thu, 27 Aug 2015 14:43:03 +0000 (14:43 +0000)]
am
a265b5a8: am
a4a67260: (-s ours) Ext4utils: Fix unused parameters
* commit '
a265b5a8f4042b42f0f57f318e14ac9d12421573':
Ext4utils: Fix unused parameters
Dan Albert [Thu, 27 Aug 2015 14:43:01 +0000 (14:43 +0000)]
am
c26a460f: am
2aaa82e4: (-s ours) am
89a2254a: Merge "Add missing include."
* commit '
c26a460f6c89de0bd0a65fb5378fd34af9e01490':
Dan Albert [Thu, 27 Aug 2015 14:43:00 +0000 (14:43 +0000)]
am
d2341549: am
b3b872cb: (-s ours) am
587fc682: Merge "Add missing includes for pid_t."
* commit '
d23415495482049398c36e7b429d744095cd801c':
Elliott Hughes [Thu, 27 Aug 2015 14:42:59 +0000 (14:42 +0000)]
am
9f70e75e: am
ea239735: (-s ours) am
31d0d7cb: Merge "Add <endian.h> back and stop building one tool for the Mac."
* commit '
9f70e75e503e170788146e642487277420fb9421':
Elliott Hughes [Thu, 27 Aug 2015 14:42:58 +0000 (14:42 +0000)]
am
cc5804e4: am
3881aa9e: (-s ours) am
4361173d: Merge "Another go at fixing the Mac build."
* commit '
cc5804e4ddf89324777962a704acb64b0f3d22ea':
Elliott Hughes [Thu, 27 Aug 2015 14:42:57 +0000 (14:42 +0000)]
am
da8f85a6: am
a8b5f7e7: (-s ours) resolved conflicts for merge of
b699685e to mnc-dev-plus-aosp
* commit '
da8f85a62cb5f341e209cc33ab4f499441963205':
Yabin Cui [Thu, 27 Aug 2015 14:42:56 +0000 (14:42 +0000)]
am
0ab1c386: am
1d4a76c5: (-s ours) am
c19b2933: Merge "Simpleperf: add filters to report command."
* commit '
0ab1c3860ea8150967db205d38f243a871eb8978':
Yabin Cui [Thu, 27 Aug 2015 14:42:55 +0000 (14:42 +0000)]
am
cd79e4ae: am
decd599f: (-s ours) am
a5732f78: Merge "Simpleperf: support caller callgraph."
* commit '
cd79e4aec6c2f8de3dc6cc389bc8afff7b0f2afd':
Yabin Cui [Thu, 27 Aug 2015 14:42:53 +0000 (14:42 +0000)]
am
83e0d872: am
cc22abb7: (-s ours) am
32ee7cc0: Merge "Simpleperf: don\'t check for empty build id."
* commit '
83e0d872414dd68eea1d65fddd3486d6b3351cf4':