Mark Salyzyn
914eec761f
am 8299ff70: Merge "init: 64-bit build issue" into klp-volantis-dev
...
* commit '8299ff701b66caf513e6cc8807b413bf44b8c2f6':
init: 64-bit build issue
2014-03-17 15:50:22 +00:00
Mark Salyzyn
8299ff701b
Merge "init: 64-bit build issue" into klp-volantis-dev
2014-03-17 15:46:19 +00:00
Mark Salyzyn
0aff05eb8c
init: 64-bit build issue
...
Change-Id: Icc5344abc184adf4247175d85b2da08af4636e49
2014-03-17 08:38:37 -07:00
Brian Carlstrom
c8e20472a7
am a4961e66: am d84869fb: am a0915abd: Merge "Fix build some more"
...
* commit 'a4961e66b539d69b7656d93db05371b20efc8f3b':
Fix build some more
2014-03-15 21:29:45 +00:00
Brian Carlstrom
a4961e66b5
am d84869fb: am a0915abd: Merge "Fix build some more"
...
* commit 'd84869fbb8589430981ba19d2d1cbc9ef58b8df3':
Fix build some more
2014-03-15 21:26:33 +00:00
Brian Carlstrom
d84869fbb8
am a0915abd: Merge "Fix build some more"
...
* commit 'a0915abd2fb57113bc46e8d8fe5013ca4a9ef6e8':
Fix build some more
2014-03-15 21:24:38 +00:00
Brian Carlstrom
a0915abd2f
Merge "Fix build some more"
2014-03-15 21:19:28 +00:00
Christopher Tate
5a6b8d15ea
Fix build some more
...
Missed one.
(cherry picked from commit f7f080ce62
)
Change-Id: I33bf8bcc651330b9bc434da02c47c29bc0d54369
2014-03-15 14:16:26 -07:00
Brian Carlstrom
287b32b7f0
am ccd830ad: am 1ba8eb6b: am 8e012107: Merge "Fix the build"
...
* commit 'ccd830adad7c1723331b6f3d2122b910088dd377':
Fix the build
2014-03-15 21:07:40 +00:00
Brian Carlstrom
ccd830adad
am 1ba8eb6b: am 8e012107: Merge "Fix the build"
...
* commit '1ba8eb6bf8efb4bd3c2bec6ff8ffd8ae6ee91ac8':
Fix the build
2014-03-15 21:05:51 +00:00
Brian Carlstrom
1ba8eb6bf8
am 8e012107: Merge "Fix the build"
...
* commit '8e01210767493ceb8f264c1bef7a635f0aa32222':
Fix the build
2014-03-15 21:03:18 +00:00
Brian Carlstrom
8e01210767
Merge "Fix the build"
2014-03-15 20:59:19 +00:00
Christopher Tate
dc507769b5
Fix the build
...
(cherry-picked from commit 296dc44637
)
Change-Id: I924f4796fbb70a0f45cc23a852e26e634c5b0e0e
2014-03-15 13:57:34 -07:00
Mark Salyzyn
a0934327c2
am 22377569: am 092e3d55: am 7ad09634: Merge "libziparchive: 64 bit compile issues"
...
* commit '22377569bbac6621a47a478856799588c5f5a3b6':
libziparchive: 64 bit compile issues
2014-03-15 00:30:46 +00:00
Mark Salyzyn
22377569bb
am 092e3d55: am 7ad09634: Merge "libziparchive: 64 bit compile issues"
...
* commit '092e3d5537996d1fb0af715cceb95fd28026025e':
libziparchive: 64 bit compile issues
2014-03-14 23:41:59 +00:00
Mark Salyzyn
092e3d5537
am 7ad09634: Merge "libziparchive: 64 bit compile issues"
...
* commit '7ad096340fd5170267b12a6bd577e9d30353564f':
libziparchive: 64 bit compile issues
2014-03-14 23:36:59 +00:00
Mark Salyzyn
7ad096340f
Merge "libziparchive: 64 bit compile issues"
2014-03-14 23:30:40 +00:00
Christopher Tate
f7f080ce62
Fix build some more
...
Missed one.
Change-Id: Ic014efd927beb2df63657951e6b0f15d94e927f8
2014-03-14 14:59:53 -07:00
Mark Salyzyn
99ef9914be
libziparchive: 64 bit compile issues
...
- All within LOG messages.
Change-Id: I52e81b49e8127276359c62febd4cc1d8d69102d9
2014-03-14 14:47:15 -07:00
Christopher Tate
362bdf4041
Merge "Fix the build"
2014-03-14 21:40:24 +00:00
Christopher Tate
296dc44637
Fix the build
...
Change-Id: I924f4796fbb70a0f45cc23a852e26e634c5b0e0e
2014-03-14 14:37:39 -07:00
Mark Salyzyn
731e24e99f
am fd0f4d9a: am 8b8974ef: am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings"
...
* commit 'fd0f4d9ad6e37d8047767e7e1ce9374906a3acc8':
toolbox: ls: 64 bit compile warnings
2014-03-14 21:35:41 +00:00
Mark Salyzyn
fd0f4d9ad6
am 8b8974ef: am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings"
...
* commit '8b8974ef566599aebfc4d8614bc8d18ecffad652':
toolbox: ls: 64 bit compile warnings
2014-03-14 21:02:50 +00:00
Mark Salyzyn
8b8974ef56
am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings"
...
* commit '31fa96047404496e902217b2d701b9ab4ac3a6f7':
toolbox: ls: 64 bit compile warnings
2014-03-14 20:59:57 +00:00
Mark Salyzyn
31fa960474
Merge "toolbox: ls: 64 bit compile warnings"
2014-03-14 20:52:59 +00:00
Mark Salyzyn
4727c7711e
toolbox: ls: 64 bit compile warnings
...
Change-Id: Ia538c7177f8d5cf2c1f0efb5b575da6527c13968
2014-03-14 13:47:16 -07:00
David 'Digit' Turner
c5036da72c
am 176bf95b: am 111c882b: am ee223d50: Merge "adb: Increase the max number of emulator instances to 64"
...
* commit '176bf95b4e37413d143fbdcf709605b8d6fb7990':
adb: Increase the max number of emulator instances to 64
2014-03-14 20:43:19 +00:00
David 'Digit' Turner
176bf95b4e
am 111c882b: am ee223d50: Merge "adb: Increase the max number of emulator instances to 64"
...
* commit '111c882b3ca61a3a3c069d0ad69b64053f991e15':
adb: Increase the max number of emulator instances to 64
2014-03-14 20:39:49 +00:00
David 'Digit' Turner
111c882b3c
am ee223d50: Merge "adb: Increase the max number of emulator instances to 64"
...
* commit 'ee223d50a009af39be577c30cc35257c751f05a1':
adb: Increase the max number of emulator instances to 64
2014-03-14 20:35:08 +00:00
David 'Digit' Turner
ee223d50a0
Merge "adb: Increase the max number of emulator instances to 64"
2014-03-14 20:27:47 +00:00
Mark Salyzyn
8e45a18a7e
am 92c2beb5: am 85629953: am 3b8de670: Merge "liblog: Build Breakage in sdk(linux)"
...
* commit '92c2beb56306797c362286d866262f16569b258e':
liblog: Build Breakage in sdk(linux)
2014-03-14 19:29:39 +00:00
Mark Salyzyn
92c2beb563
am 85629953: am 3b8de670: Merge "liblog: Build Breakage in sdk(linux)"
...
* commit '85629953f54603d660f932bebf2c26a009aec380':
liblog: Build Breakage in sdk(linux)
2014-03-14 19:26:43 +00:00
Mark Salyzyn
85629953f5
am 3b8de670: Merge "liblog: Build Breakage in sdk(linux)"
...
* commit '3b8de6705bb5c77b6f459fd6dd394ef606228a05':
liblog: Build Breakage in sdk(linux)
2014-03-14 19:24:18 +00:00
Mark Salyzyn
3b8de6705b
Merge "liblog: Build Breakage in sdk(linux)"
2014-03-14 19:18:23 +00:00
Mark Salyzyn
c0626fdcaf
liblog: Build Breakage in sdk(linux)
...
- Build Breakage in branch: aosp-idea133 @ 1072786
Change-Id: I36da253b69a66977ec568a5f96d38b970c25fe3e
2014-03-14 12:05:57 -07:00
Mark Salyzyn
6b9096b454
am e42e9db3: am 19bbf92d: am fc204a96: Merge changes Ia9509ad0,I4e815d74,I10e8d92c
...
* commit 'e42e9db3143f819e19684d4f882ef3834454a44d':
logcat: test White Black list
logd: Find log time for arbitrary time to tail
logd: liblog: logcat: Arbitrary time to tail
2014-03-14 18:05:24 +00:00
Mark Salyzyn
e42e9db314
am 19bbf92d: am fc204a96: Merge changes Ia9509ad0,I4e815d74,I10e8d92c
...
* commit '19bbf92de92ad9dbfb26b3a94025bf6e6cb72cee':
logcat: test White Black list
logd: Find log time for arbitrary time to tail
logd: liblog: logcat: Arbitrary time to tail
2014-03-14 18:01:25 +00:00
Mark Salyzyn
19bbf92de9
am fc204a96: Merge changes Ia9509ad0,I4e815d74,I10e8d92c
...
* commit 'fc204a966f953867367f54bda126a2e7d7d98814':
logcat: test White Black list
logd: Find log time for arbitrary time to tail
logd: liblog: logcat: Arbitrary time to tail
2014-03-14 17:58:44 +00:00
JP Abgrall
850c4b7fa2
am 62488ba3: am d94ed2c8: am 7283db6d: am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60
...
* commit '62488ba3df2fdca2adb311254ad526e4707713e3':
init.rc: prep tcp_default_init_rwnd, set the default to 60
2014-03-14 17:54:15 +00:00
Mark Salyzyn
fc204a966f
Merge changes Ia9509ad0,I4e815d74,I10e8d92c
...
* changes:
logcat: test White Black list
logd: Find log time for arbitrary time to tail
logd: liblog: logcat: Arbitrary time to tail
2014-03-14 17:49:42 +00:00
Mark Salyzyn
bbfef6eda8
am e726e1ba: am f37986e2: am 6ab10a1c: Merge "libdiskconfig: 64-bit issues"
...
* commit 'e726e1ba20385574450ab62b77cbfa97019aa98e':
libdiskconfig: 64-bit issues
2014-03-14 17:38:48 +00:00
Mark Salyzyn
95cfc7b8e2
logcat: test White Black list
...
Change-Id: Ia9509ad09dd86e4d9169ed7d0b33911f1ca9eec6
2014-03-14 10:24:42 -07:00
Mark Salyzyn
a1c60cf80d
logd: Find log time for arbitrary time to tail
...
- prototype to evaluate the increase in complexity or
performance impact.
Change-Id: I4e815d74c023092fbb75055d260f75de57ad6522
2014-03-14 10:24:19 -07:00
Mark Salyzyn
fa3716b250
logd: liblog: logcat: Arbitrary time to tail
...
Change-Id: I10e8d92c933e31ee11e78d2d1114261a30c4be0e
2014-03-14 10:23:51 -07:00
Mark Salyzyn
ed6178976d
am 713aedd7: am 9e38da5f: am 1a379899: Merge "toolbox: schedtop 64 bit build issue"
...
* commit '713aedd74a9e7bf81929ccd8225d2784afcbb9c9':
toolbox: schedtop 64 bit build issue
2014-03-14 17:13:11 +00:00
JP Abgrall
62488ba3df
am d94ed2c8: am 7283db6d: am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60
...
* commit 'd94ed2c8fea4733684e4ebbf55c112828562b7a7':
init.rc: prep tcp_default_init_rwnd, set the default to 60
2014-03-14 16:36:29 +00:00
JP Abgrall
d94ed2c8fe
am 7283db6d: am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60
...
* commit '7283db6d2694c8deae644a0d815cf292309a6176':
init.rc: prep tcp_default_init_rwnd, set the default to 60
2014-03-14 16:32:41 +00:00
JP Abgrall
7283db6d26
am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60
...
* commit 'efbf36f2dad8f083de6f48dbb682461d7cfa9781':
init.rc: prep tcp_default_init_rwnd, set the default to 60
2014-03-14 16:28:05 +00:00
Dmitry Grinberg
032964f228
am cae42a9b: am c08496a6: am 0d4a4cb8: fastboot: allow format on devices with small buffers
...
* commit 'cae42a9bb90c111891acc674fe339ced1873fb6f':
fastboot: allow format on devices with small buffers
2014-03-14 13:13:42 +00:00
Mark Salyzyn
60b7b41322
am ba1987fb: am 77eed05b: am f3dcda5f: Merge changes I1572338c,I39965007,I521753b1
...
* commit 'ba1987fb30635ccc26dc6bbb6c2e52d2264e3929':
logd: liblog: logcat: Add LogWhiteBlackList
logd: prune by worst offending UID
logd: liblog: logcat: Add Statistics
2014-03-14 10:46:39 +00:00