OSDN Git Service
Eric Laurent [Thu, 8 May 2014 21:11:16 +0000 (21:11 +0000)]
Merge "audio policy: fix mute delay when setting output device"
Eric Laurent [Thu, 8 May 2014 02:48:15 +0000 (19:48 -0700)]
audio policy: fix mute delay when setting output device
The duration of the temporary mute applied on each output
when switching device must be more than twice the actual delay
we wait for the mute to be effective at the output.
Otherwise some outputs with short latencies will be unmuted before the
device switch is actually executed.
This change makes sure that we take the maximum wait time into account
when requesting the delayed unmuting of each output.
Change-Id: Id92c201b47786082a44b6a5c1c8015273835a42e
Ying Wang [Thu, 8 May 2014 20:48:00 +0000 (13:48 -0700)]
resolved conflicts for merge of
cf79c7a5 to master
Change-Id: Ic4e75541193f733f477cfa4a2a87cce4c9e64f45
Glenn Kasten [Thu, 8 May 2014 19:02:25 +0000 (19:02 +0000)]
Merge "Add client side support for more AUDIO_FORMAT_PCM_*"
Marco Nelissen [Thu, 8 May 2014 17:43:04 +0000 (17:43 +0000)]
Merge "Make AMediaCodec_create* APIs more like their Java counterparts"
Marco Nelissen [Wed, 7 May 2014 23:03:54 +0000 (16:03 -0700)]
Make AMediaCodec_create* APIs more like their Java counterparts
and add configure flags.
Change-Id: Ibfb7f8cad724fa1db2320966828104d40b5e6590
Glenn Kasten [Thu, 8 May 2014 15:40:09 +0000 (15:40 +0000)]
Merge "Add a per-thread heap that is read-only to clients"
Ying Wang [Thu, 8 May 2014 08:55:36 +0000 (08:55 +0000)]
am
02483465: am
1d2909b3: Merge "Remove unused LOCAL_LDLIBS."
* commit '
02483465e294571a6a92fce4f38c933e77bf5e67':
Remove unused LOCAL_LDLIBS.
Ying Wang [Thu, 8 May 2014 07:27:53 +0000 (07:27 +0000)]
am
1d2909b3: Merge "Remove unused LOCAL_LDLIBS."
* commit '
1d2909b38f76d9d866e61cf505b88518d3a52acf':
Remove unused LOCAL_LDLIBS.
Ying Wang [Thu, 8 May 2014 07:25:00 +0000 (07:25 +0000)]
Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Thu, 8 May 2014 07:23:11 +0000 (00:23 -0700)]
Remove unused LOCAL_LDLIBS.
Change-Id: I14865bee99fbcc5188b64fbd22bb49a1947ec6ff
Eric Laurent [Thu, 8 May 2014 02:35:04 +0000 (02:35 +0000)]
Merge "audio policy: cleanup AudioPolicyService destructor"
Marco Nelissen [Wed, 7 May 2014 23:02:56 +0000 (23:02 +0000)]
Merge "Expand AMediaFormat"
Glenn Kasten [Wed, 7 May 2014 15:43:45 +0000 (08:43 -0700)]
Add a per-thread heap that is read-only to clients
Change-Id: I401263566ca20fbfb565689c8fa99458d3b283b2
Glenn Kasten [Wed, 30 Apr 2014 22:50:31 +0000 (15:50 -0700)]
Add client side support for more AUDIO_FORMAT_PCM_*
As much as possible, the checks for specific formats are done on server
side. The only exception is 8-bit, which needs a client side workaround.
Change-Id: I52fe086c039460c8dac009de03b67eb54c56a836
Marco Nelissen [Wed, 7 May 2014 19:55:18 +0000 (12:55 -0700)]
Expand AMediaFormat
Remove getDouble and getSize methods, since these are not used and/or
not present in the corresponding Java MediaFormat API.
Add setBuffer/getBuffer, needed for making formats for encoding, and
add other setters.
Change-Id: I528d51b4ed571d852b949637f7ae3a95d31da7c1
Marco Nelissen [Wed, 7 May 2014 19:55:09 +0000 (19:55 +0000)]
Merge "Add NDK version of MediaMuxer"
Eric Laurent [Wed, 7 May 2014 18:58:24 +0000 (11:58 -0700)]
audio policy: cleanup AudioPolicyService destructor
No need to clear strong pointers in the destuctor.
Add explicit exit() command to mOutputCommandThread.
Change-Id: I60bb248fe6a20bfd8a55358ef139692b93df0238
Glenn Kasten [Wed, 7 May 2014 18:55:03 +0000 (18:55 +0000)]
Merge "Fix a couple of fast capture typo bugs"
Glenn Kasten [Wed, 7 May 2014 18:17:52 +0000 (11:17 -0700)]
Fix a couple of fast capture typo bugs
AudioRecord constructor was not passing flags through to set().
Server-side check was using wrong kind of channel mask.
Change-Id: Ifaa880ec323771e9fd168262be05f3e539f53390
Andy Hung [Wed, 7 May 2014 16:59:29 +0000 (16:59 +0000)]
Merge "Remove legacy omx_message variables"
Marco Nelissen [Tue, 6 May 2014 23:08:19 +0000 (16:08 -0700)]
Add NDK version of MediaMuxer
and add some constness here and there.
Change-Id: Ib3caa8310691e8f27aaa1afcfaec0b384513d4f1
Eric Laurent [Wed, 7 May 2014 16:10:01 +0000 (09:10 -0700)]
audio policy: fix typo in AudioPolicyManager constructor
Fix cut/paste error in new AudioPolicyManager constructor
causing the same index variable to be reused in nested for loops.
Change-Id: Id57ff19bf6dd8974486b07c8252029e377df2747
Eric Laurent [Wed, 7 May 2014 15:58:07 +0000 (15:58 +0000)]
Merge "audio policy: update from libhardware_legacy"
Andy Hung [Tue, 6 May 2014 22:05:53 +0000 (15:05 -0700)]
Remove legacy omx_message variables
Remove platform_private and data_ptr from omx_message.
These were used for legacy deferred buffer creation.
See OMXCodec quirks: kDefersOutputBufferAllocation and
kRequiresAllocateBufferOnOutputPorts.
Change-Id: I94da56bc64f3b46ee1276e93d67b36c1662e2eaf
Signed-off-by: Andy Hung <hunga@google.com>
Marco Nelissen [Tue, 6 May 2014 22:46:09 +0000 (22:46 +0000)]
Merge "MediaFormat owns its strings"
Zhijun He [Tue, 6 May 2014 18:37:54 +0000 (18:37 +0000)]
Merge "Camera3: fix missing string in logging code"
Zhijun He [Tue, 6 May 2014 18:33:52 +0000 (11:33 -0700)]
Camera3: fix missing string in logging code
Change-Id: I15da6bb8b586b4641837f42d2145530fb45dd0bd
Eric Laurent [Tue, 6 May 2014 01:13:44 +0000 (18:13 -0700)]
audio policy: update from libhardware_legacy
Merge changes made to AudioPolicyManagerBase in libhardware_legacy
since it was forked here:
fd61179 Update policy handling for USB inputs
c7b6e3c audio: allow compiling for 64-bit
c26f454 Initial implementation of USB Audio output.
a7b1bc9 Audio policy is 32-bit only
26101ad audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable
Change-Id: I22bc883c20603a6598c6ee3ded636e9cc4d9ec03
Marco Nelissen [Tue, 6 May 2014 17:33:07 +0000 (10:33 -0700)]
MediaFormat owns its strings
Have MediaFormat own the strings it returns from toString and getString,
reducing the chance of memory leaks.
Change-Id: I0ddd593874c8b3af0b7714f2d8a106edf8121108
Eric Laurent [Tue, 6 May 2014 15:35:34 +0000 (15:35 +0000)]
am
71171988: am
f655acf1: am
8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()"
* commit '
711719885d7563068579abf347c366cf6bc906f5':
Fix memory leak when filtering commands in insertCommand_l()
Eric Laurent [Tue, 6 May 2014 15:30:49 +0000 (15:30 +0000)]
am
f655acf1: am
8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()"
* commit '
f655acf15e587dbf5d7120e9f2bf4b5bcb89941c':
Fix memory leak when filtering commands in insertCommand_l()
Eric Laurent [Tue, 6 May 2014 15:28:39 +0000 (15:28 +0000)]
am
8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()"
* commit '
8fb04d474ed9e0d1302ae223ee76fafbe5fb41a3':
Fix memory leak when filtering commands in insertCommand_l()
Eric Laurent [Tue, 6 May 2014 15:25:45 +0000 (15:25 +0000)]
Merge "Fix memory leak when filtering commands in insertCommand_l()"
Andy Hung [Tue, 6 May 2014 00:45:15 +0000 (00:45 +0000)]
Merge "Remove warnings in recordvideo"
Andy Hung [Fri, 2 May 2014 01:47:58 +0000 (18:47 -0700)]
Remove warnings in recordvideo
Change-Id: I2ed72836210fd3a02c7bceeb5fccadf8dcb92fbc
Signed-off-by: Andy Hung <hunga@google.com>
Andy Hung [Tue, 6 May 2014 00:17:13 +0000 (00:17 +0000)]
Merge "Fix audioloop test program"
Andy Hung [Thu, 24 Apr 2014 01:34:02 +0000 (18:34 -0700)]
Fix audioloop test program
Change-Id: Ic31966095d719cf2b33322675d7d0a2e6a203268
Signed-off-by: Andy Hung <hunga@google.com>
Marco Nelissen [Mon, 5 May 2014 21:49:25 +0000 (21:49 +0000)]
Merge "Don't build libmediandk for PDK"
Marco Nelissen [Mon, 5 May 2014 21:48:34 +0000 (14:48 -0700)]
Don't build libmediandk for PDK
Change-Id: I9b2e5f5c8cc0fad59d4a4268c8767f540d536d10
Marco Nelissen [Mon, 5 May 2014 21:07:52 +0000 (21:07 +0000)]
Merge "WIP: MediaCodec and friends NDK APIs, plain C version"
Glenn Kasten [Mon, 5 May 2014 17:57:57 +0000 (17:57 +0000)]
Merge "Use audio_is_linear_pcm()"
Marco Nelissen [Thu, 1 May 2014 17:14:44 +0000 (10:14 -0700)]
WIP: MediaCodec and friends NDK APIs, plain C version
Change-Id: I9ed6b9c5afb026a1b5fe8b652e75635bbcc223df
Ruben Brunk [Mon, 5 May 2014 17:40:08 +0000 (17:40 +0000)]
Merge "camera3: Update CameraMetadata vendor tag handling."
Natalie Silvanovich [Mon, 5 May 2014 17:10:14 +0000 (17:10 +0000)]
Merge "NULL check in ConnectPro"
Natalie Silvanovich [Thu, 1 May 2014 21:44:52 +0000 (14:44 -0700)]
NULL check in ConnectPro
Prevents service crash
Bug:
13744720
Change-Id: I7a5cdba830b4f96660f890ede6b94c38fc3108dd
Ruben Brunk [Thu, 17 Apr 2014 23:14:57 +0000 (16:14 -0700)]
camera3: Update CameraMetadata vendor tag handling.
Bug:
12134423
Change-Id: I97dc955ee9dd78ace93a7946296d6d9b0e407d43
Ruben Brunk [Sat, 3 May 2014 00:29:04 +0000 (00:29 +0000)]
Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""
Ruben Brunk [Sat, 3 May 2014 00:28:33 +0000 (00:28 +0000)]
Revert "camera3: Update CameraMetadata vendor tag handling."
This reverts commit
4764324d2704f1b08bb7407014bf203924ff2363.
Change-Id: I86d7fcc11423502b73fab2a82af6aa89804f0b76
Ruben Brunk [Fri, 2 May 2014 22:23:44 +0000 (22:23 +0000)]
Merge "camera3: Update CameraMetadata vendor tag handling."
Ruben Brunk [Thu, 17 Apr 2014 23:14:57 +0000 (16:14 -0700)]
camera3: Update CameraMetadata vendor tag handling.
Bug:
12134423
Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e
Glenn Kasten [Fri, 2 May 2014 21:59:52 +0000 (21:59 +0000)]
Merge "Fix bug for direct track with PCM != 16-bit"
Glenn Kasten [Wed, 30 Apr 2014 23:54:30 +0000 (16:54 -0700)]
Fix bug for direct track with PCM != 16-bit
The AUDIO_FORMAT_PCM_8_BIT format was being converted to
AUDIO_FORMAT_PCM_16_BIT on client side even for direct tracks.
That conversion was incorrect; it should only be done for mixed tracks.
Also remove checks for specific PCM formats in the generic part of
server side of createTrack. Those format checks should only be done by
the thread. This will allow direct tracks for PCM 8-bit, PCM 24-bit, etc.
Change-Id: If5b9fd79f8642ed93e2aeabcaf4809b2ed798978
Zhijun He [Fri, 2 May 2014 18:45:46 +0000 (18:45 +0000)]
Merge "Camera3: Don't notifyError for non-fatal errors"
Glenn Kasten [Fri, 2 May 2014 18:14:34 +0000 (11:14 -0700)]
Use audio_is_linear_pcm()
Change-Id: I17b30fdb6dbb6454ad0a20dd703fd603a37a8397
Lajos Molnar [Fri, 2 May 2014 18:10:24 +0000 (18:10 +0000)]
am
63249d6e: am
bc4bf532: am
b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"
* commit '
63249d6ea560b2f29d3ee255951f527b01ecbac5':
AwesomePlayer: use PTS for queueBuffer
Lajos Molnar [Fri, 2 May 2014 18:06:42 +0000 (18:06 +0000)]
am
113f2122: am
5fa3f7af: am
b52675e9: Merge "Smooth out AwesomePlayer"
* commit '
113f2122662856f2482836f1b4c585a050888afa':
Smooth out AwesomePlayer
Lajos Molnar [Fri, 2 May 2014 18:04:22 +0000 (18:04 +0000)]
am
bc4bf532: am
b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"
* commit '
bc4bf532b7581ecb1c8734a63742183c3ecb02c5':
AwesomePlayer: use PTS for queueBuffer
Lajos Molnar [Fri, 2 May 2014 18:01:21 +0000 (18:01 +0000)]
am
b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"
* commit '
b231408849158baea8dddc0edf7e97fcfc2e3240':
AwesomePlayer: use PTS for queueBuffer
Lajos Molnar [Fri, 2 May 2014 18:00:44 +0000 (18:00 +0000)]
am
5fa3f7af: am
b52675e9: Merge "Smooth out AwesomePlayer"
* commit '
5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5':
Smooth out AwesomePlayer
Lajos Molnar [Fri, 2 May 2014 17:57:56 +0000 (17:57 +0000)]
am
b52675e9: Merge "Smooth out AwesomePlayer"
* commit '
b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb':
Smooth out AwesomePlayer
Lajos Molnar [Fri, 2 May 2014 17:56:37 +0000 (17:56 +0000)]
Merge "AwesomePlayer: use PTS for queueBuffer"
Lajos Molnar [Fri, 2 May 2014 17:53:58 +0000 (17:53 +0000)]
Merge "Smooth out AwesomePlayer"
Lajos Molnar [Fri, 2 May 2014 17:21:53 +0000 (17:21 +0000)]
am
9e0922ba: am
6e76fda3: am
f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"
* commit '
9e0922ba7dda72fc94d2af2872cfc630ad599c91':
AwesomePlayer: improve scheduling of video event to hit PTS
Lajos Molnar [Fri, 2 May 2014 17:21:52 +0000 (17:21 +0000)]
am
edf6131d: am
075c8f6e: am
a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
* commit '
edf6131d1eca1fdff3b151805d241a1cc81b52ca':
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
Lajos Molnar [Fri, 2 May 2014 17:18:02 +0000 (17:18 +0000)]
am
6e76fda3: am
f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"
* commit '
6e76fda36a87e154397de816fa091b721a4c11bd':
AwesomePlayer: improve scheduling of video event to hit PTS
Lajos Molnar [Fri, 2 May 2014 17:18:01 +0000 (17:18 +0000)]
am
075c8f6e: am
a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
* commit '
075c8f6e174e824b6bc95809cc25f1430e9d4e62':
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
Lajos Molnar [Fri, 2 May 2014 17:14:18 +0000 (17:14 +0000)]
am
f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"
* commit '
f9782266802b02fc06a9c532f40128496aefb3e0':
AwesomePlayer: improve scheduling of video event to hit PTS
Lajos Molnar [Fri, 2 May 2014 17:14:17 +0000 (17:14 +0000)]
am
a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
* commit '
a69d6f529239950a8bdf5e4253ea13bb029375cb':
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
Lajos Molnar [Fri, 2 May 2014 17:11:14 +0000 (17:11 +0000)]
Merge "AwesomePlayer: improve scheduling of video event to hit PTS"
Lajos Molnar [Fri, 2 May 2014 17:10:57 +0000 (17:10 +0000)]
Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
Glenn Kasten [Fri, 2 May 2014 15:03:58 +0000 (08:03 -0700)]
resolved conflicts for merge of
47c888a9 to master
Change-Id: I4ba2fdc6374a93a892bb7651b0d174e495f09bf6
Glenn Kasten [Fri, 2 May 2014 14:51:37 +0000 (14:51 +0000)]
am
e580aa4a: am
86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally"
* commit '
e580aa4a756d1825c440a4b4309022b1babb6de1':
When passing a size_t via binder, use 64-bits unconditionally
Glenn Kasten [Fri, 2 May 2014 14:48:27 +0000 (14:48 +0000)]
am
86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally"
* commit '
86438382a381eb39ed8da53fbd16cf6730fded6c':
When passing a size_t via binder, use 64-bits unconditionally
Glenn Kasten [Fri, 2 May 2014 14:45:29 +0000 (14:45 +0000)]
Merge "When passing a size_t via binder, use 64-bits unconditionally"
Lajos Molnar [Wed, 30 Apr 2014 17:19:40 +0000 (10:19 -0700)]
AwesomePlayer: use PTS for queueBuffer
Change-Id: I1c14ad4784c799c46cf06a14b0f00c5e4d01f718
Lajos Molnar [Wed, 30 Apr 2014 18:10:44 +0000 (11:10 -0700)]
Smooth out AwesomePlayer
Use clock estimator to smooth out audio time stamps.
Change-Id: Iec1ff30c011069d06ff8051fc4839d00895463d6
Lajos Molnar [Wed, 30 Apr 2014 18:10:00 +0000 (11:10 -0700)]
AwesomePlayer: improve scheduling of video event to hit PTS
Change-Id: I7b19911acbde9b592b757b952d4ad63cd8efebed
Lajos Molnar [Tue, 22 Apr 2014 23:31:54 +0000 (16:31 -0700)]
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217
Glenn Kasten [Thu, 1 May 2014 22:53:51 +0000 (22:53 +0000)]
Merge "Use AUDIO_INTERLEAVE_* constants"
Glenn Kasten [Thu, 1 May 2014 22:25:14 +0000 (22:25 +0000)]
am
f38e1908: am
3d9164da: am
236f8ddd: Merge "Add missing include"
* commit '
f38e190887e73bc08735af95b073ebfaabd65f95':
Add missing include
Glenn Kasten [Thu, 1 May 2014 22:22:33 +0000 (22:22 +0000)]
am
3d9164da: am
236f8ddd: Merge "Add missing include"
* commit '
3d9164da1b3d58701e41c78e06839d61ed1b4ff9':
Add missing include
Glenn Kasten [Thu, 1 May 2014 22:20:06 +0000 (22:20 +0000)]
am
236f8ddd: Merge "Add missing include"
* commit '
236f8ddd23af92f98f2deae86bf6e6b5c9278857':
Add missing include
Glenn Kasten [Thu, 1 May 2014 22:18:34 +0000 (22:18 +0000)]
Merge "Add missing include"
Lajos Molnar [Thu, 1 May 2014 20:12:34 +0000 (20:12 +0000)]
am
ee46bd37: am
2b0b701f: am
0c388650: Merge "ACodec: add frame render/drop systrace"
* commit '
ee46bd378b7a68789be9c85d8a59fa02d4aed030':
ACodec: add frame render/drop systrace
Lajos Molnar [Thu, 1 May 2014 20:10:08 +0000 (20:10 +0000)]
am
2b0b701f: am
0c388650: Merge "ACodec: add frame render/drop systrace"
* commit '
2b0b701f57c5efebe868d0eedce8cfc399007e8a':
ACodec: add frame render/drop systrace
Lajos Molnar [Thu, 1 May 2014 20:07:50 +0000 (20:07 +0000)]
am
0c388650: Merge "ACodec: add frame render/drop systrace"
* commit '
0c388650722ac53571be21ee04ce342c1c9510c2':
ACodec: add frame render/drop systrace
Lajos Molnar [Thu, 1 May 2014 20:04:45 +0000 (20:04 +0000)]
Merge "ACodec: add frame render/drop systrace"
Glenn Kasten [Thu, 1 May 2014 19:34:56 +0000 (19:34 +0000)]
am
b4eacebf: am
1afedc4d: am
6eafba6b: Merge "Temporary workaround for log spam"
* commit '
b4eacebfc5c5fd86b20661eab0797ce70c66e323':
Temporary workaround for log spam
Glenn Kasten [Thu, 1 May 2014 19:31:31 +0000 (19:31 +0000)]
am
1afedc4d: am
6eafba6b: Merge "Temporary workaround for log spam"
* commit '
1afedc4d99acd52f99221d71b3a372a0a5497a84':
Temporary workaround for log spam
Glenn Kasten [Thu, 1 May 2014 19:29:25 +0000 (19:29 +0000)]
am
6eafba6b: Merge "Temporary workaround for log spam"
* commit '
6eafba6bba3a4949cf3807ea39d5c1e969bebc52':
Temporary workaround for log spam
Glenn Kasten [Thu, 1 May 2014 19:27:02 +0000 (19:27 +0000)]
Merge "Temporary workaround for log spam"
Glenn Kasten [Thu, 1 May 2014 17:41:11 +0000 (10:41 -0700)]
Temporary workaround for log spam
Bug:
13790505
Change-Id: Icfc403bceaefdede1af65dfd70ba3e8b26abab02
Zhijun He [Thu, 1 May 2014 17:39:16 +0000 (10:39 -0700)]
Camera3: Don't notifyError for non-fatal errors
Bug:
14448494
Change-Id: Ie2e2dc6a8475189707c556845adb77f20f270df5
Glenn Kasten [Thu, 1 May 2014 00:04:13 +0000 (17:04 -0700)]
Use AUDIO_INTERLEAVE_* constants
Change-Id: I6609fa75c9a57fc4ca3887d626a2f4fb8b6593a1
Glenn Kasten [Wed, 30 Apr 2014 23:59:40 +0000 (23:59 +0000)]
am
3c782246: am
b1d2b51c: am
761636f3: Merge "Do not force all command-line apps to be 32-bit only"
* commit '
3c782246d5ee9869f2167a00df748eac1b9e9153':
Do not force all command-line apps to be 32-bit only
Glenn Kasten [Wed, 30 Apr 2014 23:56:24 +0000 (23:56 +0000)]
am
b1d2b51c: am
761636f3: Merge "Do not force all command-line apps to be 32-bit only"
* commit '
b1d2b51c4652ecdea907a5a6865d55a9bc52c6a2':
Do not force all command-line apps to be 32-bit only
Glenn Kasten [Wed, 30 Apr 2014 23:52:49 +0000 (23:52 +0000)]
am
761636f3: Merge "Do not force all command-line apps to be 32-bit only"
* commit '
761636f3c2904a9e1fb03991b6896ed7113f8596':
Do not force all command-line apps to be 32-bit only
Glenn Kasten [Wed, 30 Apr 2014 23:50:37 +0000 (23:50 +0000)]
Merge "Do not force all command-line apps to be 32-bit only"
Glenn Kasten [Wed, 30 Apr 2014 22:53:01 +0000 (15:53 -0700)]
resolved conflicts for merge of
0d79b935 to master
Change-Id: If6de8c1b1d7707918e2a60ea8583749e0127edb8
OSDN Git Service
