Sreeram Ramachandran
2f26cd9ea6
am 85449d36
: am b12e40da
: am 0a7b44d5
: am ab98d2e6
: Merge "Create a data directory for netd and other network-related files."
...
* commit '85449d360f86ed9faaf1403f972f9657698a8289':
2014-07-14 01:56:49 +00:00
Elliott Hughes
ef0a3cfaf0
am 81542db7
: am f761709a
: am 1829b14c
: am 18e754ee
: Merge "Fix LP64 tombstone.cpp build failure."
...
* commit '81542db7c2cdf44803ba36be0f8cd76972790fc0':
2014-07-14 01:56:49 +00:00
Elliott Hughes
3c6216a894
am 85090337
: am 4f27968f
: am 494bd36d
: am dda63545
: Merge "Improving maps output."
...
* commit '850903371fce13933d5b9cfaf16d777fcd329296':
2014-07-14 01:56:48 +00:00
dcashman
1ecce47dfb
am 9f3a11ed
: am cddb15b8
: am b4e74db7
: am 3fa71b8e
: Merge "Remove sshd."
...
* commit '9f3a11edde07af068217581cf11c004f1cdca3f0':
2014-07-14 01:56:47 +00:00
Hans Boehm
0de8ac248a
am e6b0c566
: am 981dcd79
: Merge "Add comment to discourage use of cutils/atomic.h."
...
* commit 'e6b0c566762dbea1c45198d15ecc5e8a59378d73':
Add comment to discourage use of cutils/atomic.h.
2014-07-13 08:18:24 -07:00
Hans Boehm
4b9f899bf1
am e6b0c566
: am 981dcd79
: Merge "Add comment to discourage use of cutils/atomic.h."
...
* commit 'e6b0c566762dbea1c45198d15ecc5e8a59378d73':
Add comment to discourage use of cutils/atomic.h.
2014-07-12 19:36:58 +00:00
Christopher Ferris
611dceecd5
am ce61f74f
: am 56cbd19b
: Merge "Fix build."
...
* commit 'ce61f74f153c7d185d1a3d5e2d6dc02ccf768963':
Fix build.
2014-07-12 19:36:58 +00:00
Elliott Hughes
c785caa4b4
am 802943ab
: am 8098114c
: Merge "Sync with upstream grep."
...
* commit '802943ab514de0814078b2e0a400d18632daa188':
Sync with upstream grep.
2014-07-12 19:36:58 +00:00
Elliott Hughes
3aad879660
am 895d6747
: am 7a8420ec
: Merge "fix duplicated grep usage printing"
...
* commit '895d67473854e89abf5834be66a79589de8c4b9e':
fix duplicated grep usage printing
2014-07-12 19:36:58 +00:00
Mark Salyzyn
7fc37b5425
am ad806908
: am 755df295
: Merge "logd: test: disable kernel LOGGER"
...
* commit 'ad806908bb68a03d34bc0bda3ad83abe321021a1':
logd: test: disable kernel LOGGER
2014-07-12 19:36:58 +00:00
Elliott Hughes
ecba4dc037
am 85dfe988
: am 796fccb8
: Merge "Fix environment variable assignment in init"
...
* commit '85dfe98830c78f1c3d400ca7be4ac594bfcdd275':
Fix environment variable assignment in init
2014-07-12 19:36:57 +00:00
Hans Boehm
e6b0c56676
am 981dcd79
: Merge "Add comment to discourage use of cutils/atomic.h."
...
* commit '981dcd79d5cbfb2192dc14706e2825b81a467af7':
Add comment to discourage use of cutils/atomic.h.
2014-07-12 19:33:37 +00:00
Hans Boehm
981dcd79d5
Merge "Add comment to discourage use of cutils/atomic.h."
2014-07-11 23:26:34 +00:00
Hans Boehm
5af7877950
Add comment to discourage use of cutils/atomic.h.
...
Change-Id: Ib05c745158fdf5a11fd4697c3665a6370ffc04f5
2014-07-11 18:30:13 -07:00
aarti jadhav-gaikwad
923e740879
audio: add definitions for aac sub formats
...
add definitions for aac sub formats
Change-Id: I610caa510dfc7347f7c98e19359545423edd76b3
2014-07-11 18:26:00 +00:00
Sreeram Ramachandran
f813da2dfc
am e26ca55b
: am b12e40da
: am 0a7b44d5
: am ab98d2e6
: Merge "Create a data directory for netd and other network-related files."
...
* commit 'e26ca55bdd3ca6530826e5248fd8dc5d8f6ba26e':
2014-07-11 17:46:58 +00:00
Elliott Hughes
99adb75562
am b5dfe272
: am f761709a
: am 1829b14c
: am 18e754ee
: Merge "Fix LP64 tombstone.cpp build failure."
...
* commit 'b5dfe27206336787a351111cc45ca362b185eb78':
2014-07-11 17:46:58 +00:00
Elliott Hughes
afacbefba8
am 7ca8bae8
: am 4f27968f
: am 494bd36d
: am dda63545
: Merge "Improving maps output."
...
* commit '7ca8bae8b4148eb204530ceeca885a3245c436b1':
2014-07-11 17:46:57 +00:00
dcashman
9ae2b5e1f4
am 8c7e0520
: am cddb15b8
: am b4e74db7
: am 3fa71b8e
: Merge "Remove sshd."
...
* commit '8c7e0520777acff9212580972d7ae04e026df1cd':
2014-07-11 17:32:59 +00:00
Sreeram Ramachandran
e26ca55bdd
am b12e40da
: am 0a7b44d5
: am ab98d2e6
: Merge "Create a data directory for netd and other network-related files."
...
* commit 'b12e40da2526881c1730a3d3387556e4600c7040':
Create a data directory for netd and other network-related files.
2014-07-11 17:29:02 +00:00
Elliott Hughes
b5dfe27206
am f761709a
: am 1829b14c
: am 18e754ee
: Merge "Fix LP64 tombstone.cpp build failure."
...
* commit 'f761709a8e0f440afbdcd0df8f78d5e8ebc94211':
Fix LP64 tombstone.cpp build failure.
2014-07-11 17:28:54 +00:00
Elliott Hughes
7ca8bae8b4
am 4f27968f
: am 494bd36d
: am dda63545
: Merge "Improving maps output."
...
* commit '4f27968f988808c713564de99c04612b9e8768b9':
Improving maps output.
2014-07-11 17:28:50 +00:00
Glenn Kasten
e60eb62384
Merge "Representation of channel masks for position assignment and index assignment"
2014-07-11 16:34:41 +00:00
Hans Boehm
b53af3f60f
am 4b9f899b
: am e6b0c566
: am 981dcd79
: Merge "Add comment to discourage use of cutils/atomic.h."
...
* commit '4b9f899bf1f5d09622307df85ba7d7f7aabbb834':
Add comment to discourage use of cutils/atomic.h.
2014-07-12 19:41:08 +00:00
Christopher Ferris
06ca5fadbd
am 611dceec
: am ce61f74f
: am 56cbd19b
: Merge "Fix build."
...
* commit '611dceecd57ab651514942823cd1eb4a10b8a9fb':
Fix build.
2014-07-12 19:41:07 +00:00
Elliott Hughes
9d6dfd63c9
am c785caa4
: am 802943ab
: am 8098114c
: Merge "Sync with upstream grep."
...
* commit 'c785caa4b44a1a96e21904fac8cf857f2d9f5e96':
Sync with upstream grep.
2014-07-12 19:41:07 +00:00
Elliott Hughes
dddb191cba
am 3aad8796
: am 895d6747
: am 7a8420ec
: Merge "fix duplicated grep usage printing"
...
* commit '3aad879660686ec3d88994bd9f0716ac861f6e2f':
fix duplicated grep usage printing
2014-07-12 19:41:06 +00:00
Mark Salyzyn
719dda65d7
am 7fc37b54
: am ad806908
: am 755df295
: Merge "logd: test: disable kernel LOGGER"
...
* commit '7fc37b542509a235423d605829c9f0cde058c4e8':
logd: test: disable kernel LOGGER
2014-07-12 19:41:05 +00:00
Elliott Hughes
913613a51d
am ecba4dc0
: am 85dfe988
: am 796fccb8
: Merge "Fix environment variable assignment in init"
...
* commit 'ecba4dc0370f4dd04833acb08901be63b6bde4b3':
Fix environment variable assignment in init
2014-07-12 19:41:05 +00:00
Glenn Kasten
432b7c6da2
Representation of channel masks for position assignment and index assignment
...
Bug: 16245854
Change-Id: I76c7c39c7d4f8d5035016653aa91fa7c1e749bbd
2014-07-12 13:23:57 +00:00
Elliott Hughes
e07d77e422
Use <sys/prctl.h> instead of <linux/prctl.h>.
...
Change-Id: I708da00e36a9da8be9184c451453774be6b78c06
2014-07-11 20:58:55 -07:00
dcashman
8c7e052077
am cddb15b8
: am b4e74db7
: am 3fa71b8e
: Merge "Remove sshd."
...
* commit 'cddb15b8a9057e7efacf2de9c9a6a887fd666663':
Remove sshd.
2014-07-11 16:19:00 +00:00
Christopher Ferris
ce61f74f15
am 56cbd19b
: Merge "Fix build."
...
* commit '56cbd19b1b8a42a0011be78aa1051304bc57127d':
Fix build.
2014-07-11 06:39:03 +00:00
Jungshik Jang
2c7cfc10f5
Remove forced usage types for HDMI-CEC system audio mode.
...
Change-Id: Ice8aab76281aa62a42665d7c86df1041c7f64ab9
2014-07-11 03:36:28 +00:00
Elliott Hughes
802943ab51
am 8098114c
: Merge "Sync with upstream grep."
...
* commit '8098114c904923d187368a331ed34a9f2d98cac5':
Sync with upstream grep.
2014-07-11 03:08:36 +00:00
Elliott Hughes
895d674738
am 7a8420ec
: Merge "fix duplicated grep usage printing"
...
* commit '7a8420ec4a7d248028b0a922e2d947f2129b1fe7':
fix duplicated grep usage printing
2014-07-11 02:12:28 +00:00
Mark Salyzyn
ad806908bb
am 755df295
: Merge "logd: test: disable kernel LOGGER"
...
* commit '755df2956fdf43e2a8e416a84361f14c474e6a8f':
logd: test: disable kernel LOGGER
2014-07-11 02:12:27 +00:00
Elliott Hughes
85dfe98830
am 796fccb8
: Merge "Fix environment variable assignment in init"
...
* commit '796fccb80d603bb79d2591047f1c3b83755bfa8b':
Fix environment variable assignment in init
2014-07-11 02:11:49 +00:00
Ruchi Kandoi
a78fc23491
healthd: Reports arbitrary numbers for capacity and temperature when
...
connected to fake battery.
Detects if the device is attached to a fake battery if yes, healthd
reports 42% battery charge and 42.2 degrees temperature.
Change-Id: I2508fd91c8d3848ea64f57ab59d20be1c2817913
2014-07-11 01:19:28 +00:00
Jungshik Jang
6fe316102a
Merge "Fix size of "values" fields of audio_gain_config."
2014-07-10 21:52:20 +00:00
Jungshik Jang
f7e5aeadb7
Fix size of "values" fields of audio_gain_config.
...
It should be sizeof(audio_channel_mask_t) * 8 not
sizeof(audio_channel_mask_t) alone.
Change-Id: I3523dd4d44a0900ba1845b3675a22451f1fc2f3c
2014-07-11 03:37:42 +00:00
Elliott Hughes
8098114c90
Merge "Sync with upstream grep."
2014-07-10 21:39:36 +00:00
Elliott Hughes
04650ef7f6
Sync with upstream grep.
...
Change-Id: Ie1da2e95ee7e3513afb87f357be983dc80cd1515
2014-07-10 19:38:01 -07:00
Colin Cross
212e979865
add cleanspec for lmkd
...
Change-Id: I249a4dcac4b12382c25f68c8d57a108794475623
2014-07-10 14:26:57 -07:00
Elliott Hughes
7a8420ec4a
Merge "fix duplicated grep usage printing"
2014-07-10 21:14:09 +00:00
Rocky Zhang
b34b1fcb2b
fix duplicated grep usage printing
...
Change-Id: I579d2046f96ba8ae9fd0bf8f36e2e2f64da622ea
Signed-off-by: Rocky Zhang <zhangyan.hit@gmail.com>
2014-07-11 09:49:35 +08:00
Mark Salyzyn
755df2956f
Merge "logd: test: disable kernel LOGGER"
2014-07-10 20:49:23 +00:00
Christopher Ferris
56cbd19b1b
Merge "Fix build."
2014-07-10 20:43:44 +00:00
Christopher Ferris
3cbea9f056
Fix build.
...
Change-Id: Ied4adacde94ee10deb30647156f07d46a38fbe1f
2014-07-10 23:12:49 -07:00
Mark Salyzyn
89472df4cd
logd: test: disable kernel LOGGER
...
Bug: 15384806
Change-Id: I3072d6dd0618fa9ebe151c78a85eb121327f9df3
2014-07-10 13:31:57 -07:00