OSDN Git Service
Calin Juravle [Wed, 5 Mar 2014 15:06:52 +0000 (15:06 +0000)]
Sync up nameser with upstream(2014.03.05)
Bug:
13219633
Change-Id: I8ee4ddf270710e9eea415fa3db984af7719a8dd4
Calin Juravle [Tue, 4 Mar 2014 15:01:29 +0000 (15:01 +0000)]
Moved nameser.h and namser_compat.h to public include dir
This is part of the upstream sync (Net/Open/Free BSDs expose the
nameser.h in their public headers).
Change-Id: Ib063d4e50586748cc70201a8296cd90d2e48bbcf
Calin Juravle [Tue, 4 Mar 2014 14:25:50 +0000 (14:25 +0000)]
Merge "Moved private dns header to their own dir."
Calin Juravle [Tue, 4 Mar 2014 14:25:30 +0000 (14:25 +0000)]
Merge "Renamed the misleading libc/netbsd directory to libc/dns."
Narayan Kamath [Tue, 4 Mar 2014 13:37:07 +0000 (13:37 +0000)]
Merge "Implement pthread_condattr_{get,set}clock."
Narayan Kamath [Mon, 3 Mar 2014 15:38:51 +0000 (15:38 +0000)]
Implement pthread_condattr_{get,set}clock.
We only support CLOCK_REALTIME and CLOCK_MONOTONIC for now,
so we us a single bit from pthread_cond_t->value to denote
the clock type. Note that this reduces the width of the counter
to 30 bits, but this should be large enough for all practical
purposes.
bug:
13232338
Change-Id: I857e7da64b3ecbb23eeac7c9f3fbd460f60231bd
Elliott Hughes [Tue, 4 Mar 2014 00:58:53 +0000 (00:58 +0000)]
Merge "Switch to upstream alarm(3)."
Elliott Hughes [Mon, 3 Mar 2014 22:38:20 +0000 (14:38 -0800)]
Switch to upstream alarm(3).
The only way the setitimer call can fail is if the unsigned number of seconds is
too large to fit in the kernel's signed number of seconds. If you schedule a
68-year alarm, glibc will fail by returning 0 and BSD will fail by returning -1.
Change-Id: Ic3721b01428f5402d99f31fd7f2ba2cc58805607
Mark Salyzyn [Mon, 3 Mar 2014 21:05:18 +0000 (21:05 +0000)]
Merge "libc: Make calls to new user-space logger (revisit)"
Calin Juravle [Mon, 3 Mar 2014 11:44:48 +0000 (11:44 +0000)]
Moved private dns header to their own dir.
Bug:
13219633
Change-Id: I3435ef7564b9ad3c7b54188a0809440993b36c9e
Mark Salyzyn [Mon, 3 Mar 2014 19:00:08 +0000 (11:00 -0800)]
libc: Make calls to new user-space logger (revisit)
* TARGET_USES_LOGD is true or false, yes is not valid
* was supposed to be in the libc_bionic definition
Change-Id: I7f15d0fe61205641f7310ba9762df885e6c959d0
Elliott Hughes [Mon, 3 Mar 2014 20:26:12 +0000 (20:26 +0000)]
Merge "If the kernel doesn't have MADV_MERGEABLE, stop asking for it."
Elliott Hughes [Mon, 3 Mar 2014 19:54:21 +0000 (11:54 -0800)]
If the kernel doesn't have MADV_MERGEABLE, stop asking for it.
Note that a dynamically-linked binary will still probably see two attempts ---
one by the dynamic linker (which will set its copy of the flag so it won't try
again) and then one by the executable itself (which gets a new uninitialized
copy of the flag).
Change-Id: Id6b7e47780f0f24d2ca0384a75373f4824fa8f12
Elliott Hughes [Mon, 3 Mar 2014 19:01:50 +0000 (19:01 +0000)]
Merge "Remove deprecated and unused constants from <sys/klog.h>."
Elliott Hughes [Mon, 3 Mar 2014 18:57:28 +0000 (10:57 -0800)]
Remove deprecated and unused constants from <sys/klog.h>.
Change-Id: I23d54b5eaf918859480f927534a3f9e3af602311
Elliott Hughes [Sat, 1 Mar 2014 01:59:55 +0000 (01:59 +0000)]
Merge "Fix build."
Elliott Hughes [Sat, 1 Mar 2014 01:59:29 +0000 (17:59 -0800)]
Fix build.
Change-Id: I71cde79263d5f5a8382865b8151f65c5c05ea17b
Elliott Hughes [Sat, 1 Mar 2014 01:14:22 +0000 (01:14 +0000)]
Merge "Add recvmmsg and sendmmsg syscalls."
Elliott Hughes [Sat, 1 Mar 2014 01:12:12 +0000 (01:12 +0000)]
Merge "Add getprogname/setprogname for BSD compatibility."
Elliott Hughes [Sat, 1 Mar 2014 00:23:27 +0000 (16:23 -0800)]
Add getprogname/setprogname for BSD compatibility.
This is one less change we have to make when porting BSD code.
Bug: https://code.google.com/p/android/issues/detail?id=34898
Change-Id: If9b1a8d16996c7a19abcce8d3a456afc3e105a41
Calin Juravle [Fri, 28 Feb 2014 18:02:22 +0000 (18:02 +0000)]
Merge "Fix locatime.c indentation after sync"
Calin Juravle [Fri, 28 Feb 2014 17:40:08 +0000 (17:40 +0000)]
Merge "Update tzcode to 2013i"
Calin Juravle [Fri, 28 Feb 2014 12:18:53 +0000 (12:18 +0000)]
Fix locatime.c indentation after sync
Bug:
12246757
Change-Id: I8186e75f4899161af48cbf66e8f907dac0a326a2
Calin Juravle [Fri, 28 Feb 2014 16:31:04 +0000 (16:31 +0000)]
Renamed the misleading libc/netbsd directory to libc/dns.
Bug:
13219633
Change-Id: Ide43add0b90b3081cc709a22d1ff1f59d65f1104
Elliott Hughes [Fri, 28 Feb 2014 16:23:40 +0000 (16:23 +0000)]
Merge "Vastly reduce the number of read(2)s done in tzload."
Calin Juravle [Fri, 28 Feb 2014 11:46:03 +0000 (11:46 +0000)]
Update tzcode to 2013i
Bug:
12246757
Change-Id: I3d5d2318155b1f54ef80afd58b1e5ca9a6d7018e
Elliott Hughes [Fri, 28 Feb 2014 02:18:25 +0000 (18:18 -0800)]
Vastly reduce the number of read(2)s done in tzload.
This costs us about 1000 fewer syscalls, which makes "adb shell strace date"
a lot more readable (which is the reason I've been meaning to fix this for a
long time now), but also actually saves a measurable amount of time.
Longer-term we should try to keep the tzdata mmap(2)ed in like libcore
does.
Change-Id: I1dd9c81968a13d3a6a55ba17f8a7d5c1f38cd103
Elliott Hughes [Fri, 28 Feb 2014 02:16:40 +0000 (02:16 +0000)]
Merge "Fix a leak on error in tzload."
Elliott Hughes [Fri, 28 Feb 2014 01:04:38 +0000 (17:04 -0800)]
Fix a leak on error in tzload.
Change-Id: Ib5d9aaa7a618e478ce8e5e82f967cf535bb1a5a3
Guillaume Ranquet [Mon, 10 Feb 2014 12:11:29 +0000 (13:11 +0100)]
Add recvmmsg and sendmmsg syscalls.
Also add the corresponding constant, struct, and function declarations
to <sys/socket.h>, and perfunctory tests so we know that the symbols
actually exist.
Signed-off-by: Guillaume Ranquet <guillaumex.ranquet@intel.com>
Change-Id: Ib0d854239d3716be90ad70973c579aff4895a4f7
Calin Juravle [Thu, 27 Feb 2014 21:31:13 +0000 (21:31 +0000)]
Merge "Fix x86_64 build"
Pavel Chupin [Thu, 27 Feb 2014 20:36:10 +0000 (00:36 +0400)]
Fix x86_64 build
Fix types after recent update:
https://android-review.googlesource.com/#/c/83435/
Change-Id: I17ed28af84b7adeb8572e18834e66f3264ec061d
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Elliott Hughes [Thu, 27 Feb 2014 00:52:35 +0000 (00:52 +0000)]
Merge "Ensure that <fcntl.h> has the SYNC_FILE_RANGE_* constants."
Mark Salyzyn [Thu, 27 Feb 2014 00:28:47 +0000 (00:28 +0000)]
Merge "libc: Make calls to new user-space logger"
Elliott Hughes [Wed, 26 Feb 2014 19:10:32 +0000 (11:10 -0800)]
Ensure that <fcntl.h> has the SYNC_FILE_RANGE_* constants.
Needed to build strace at their tip of tree.
Change-Id: I64db00a332088e08e25bc30357293a9308b8a226
Mark Salyzyn [Fri, 8 Nov 2013 14:58:01 +0000 (06:58 -0800)]
libc: Make calls to new user-space logger
* libc (fatal) logging now makes socket connection to the
user-space logging service.
* Add a TARGET_USES_LOGD make flag for BoardConfig.mk to manage
whether logd is enabled for use or not.
Change-Id: I96ab598c76d6eec86f9d0bc81094c1fb3fb0d9b4
Calin Juravle [Wed, 26 Feb 2014 21:34:56 +0000 (21:34 +0000)]
Merge "Fix mips build"
Calin Juravle [Wed, 26 Feb 2014 21:33:36 +0000 (21:33 +0000)]
Fix mips build
Change-Id: Ica843d387e115d0b27afd961af73237ec9109ed9
Calin Juravle [Wed, 26 Feb 2014 20:34:41 +0000 (20:34 +0000)]
Merge "Moved to a more openbsd-like fenv.h"
Calin Juravle [Tue, 25 Feb 2014 14:49:41 +0000 (14:49 +0000)]
Moved to a more openbsd-like fenv.h
Factored out common declarations to include/fenv.h and pushed
the implementation to .c files.
Bug:
11050744
Change-Id: I446b13cc4bc599d328343a8d392b07de280f6304
Elliott Hughes [Tue, 25 Feb 2014 23:36:42 +0000 (23:36 +0000)]
Merge "Fix log_backtrace assertion failure caused by LP64 fix."
Elliott Hughes [Tue, 25 Feb 2014 23:32:01 +0000 (15:32 -0800)]
Fix log_backtrace assertion failure caused by LP64 fix.
When libc.debug.malloc is enabled, stack backtraces fail with:
bionic/libc/bionic/libc_logging.cpp:378: assertion "conversion
specifier unsupported" failed
The cause was a change to the format specifier from "%08x" to
"%0*x" to pass the field width as an additional parameter.
Unfortunately this modifier isn't supported by out_vformat() in
libc_logging.cpp.
Changed to use "%016x" if __LP64__ is defined; "%08x" otherwise.
Bug:
13177507
Change-Id: Ibf07263acf14da086d3c3788872f4b5477bd5708
Elliott Hughes [Tue, 25 Feb 2014 23:21:00 +0000 (23:21 +0000)]
Merge "Switch to current OpenBSD system.c."
Elliott Hughes [Tue, 25 Feb 2014 23:19:26 +0000 (15:19 -0800)]
Switch to current OpenBSD system.c.
Change-Id: Ie2df60f0d55dca69149ffe064f10183411407987
Elliott Hughes [Tue, 25 Feb 2014 23:15:39 +0000 (23:15 +0000)]
Merge "Fix LP64 builds after OpenBSD string changes."
Elliott Hughes [Tue, 25 Feb 2014 23:12:29 +0000 (15:12 -0800)]
Fix LP64 builds after OpenBSD string changes.
Change-Id: I07202f6484e716d153d0387fcfc023e119438251
Elliott Hughes [Tue, 25 Feb 2014 21:41:47 +0000 (21:41 +0000)]
Merge "More OpenBSD cleanup (primarily string)."
Calin Juravle [Tue, 25 Feb 2014 10:44:25 +0000 (10:44 +0000)]
Merge "Added ftw64, nftw64"
Calin Juravle [Tue, 25 Feb 2014 10:43:30 +0000 (10:43 +0000)]
Merge "Added mkstemp64"
Elliott Hughes [Tue, 25 Feb 2014 02:00:43 +0000 (18:00 -0800)]
More OpenBSD cleanup (primarily string).
This patch removes the string/ and wchar/ directories.
Change-Id: Ia489904bc67047e4bc79acb1f3eec21aa3fe5f0d
Elliott Hughes [Tue, 25 Feb 2014 00:01:44 +0000 (00:01 +0000)]
Merge "Remove <asm/page.h>."
Elliott Hughes [Mon, 24 Feb 2014 23:55:31 +0000 (15:55 -0800)]
Remove <asm/page.h>.
If we have PAGE_SIZE/PAGESIZE, POSIX says they should be in <limits.h>.
Change-Id: I3c2d574ea2aea81f524874a156361411a4ffa18e
Calin Juravle [Mon, 24 Feb 2014 16:13:50 +0000 (16:13 +0000)]
Added ftw64, nftw64
Bug:
13076637
Change-Id: I5b926526f935b00bba14c2807b61d85f95089c33
Calin Juravle [Fri, 21 Feb 2014 15:11:03 +0000 (15:11 +0000)]
Added mkstemp64
Bug:
13076637
Change-Id: I41bf28ab3e6c7325470781e9323eeec023483df5
Narayan Kamath [Mon, 24 Feb 2014 11:14:07 +0000 (11:14 +0000)]
Merge "Fix 64-bit build."
Narayan Kamath [Mon, 24 Feb 2014 11:05:02 +0000 (11:05 +0000)]
Fix 64-bit build.
A warning about signed vs unsigned comparison was converted
into an error here :
...
struct stat st;
if (st.st_size > sizeof(prop_area) {
...
st_size is either an off64_t, which is a signed type. It's
worth investigating why this didn't trigger a warning on 32 bit,
where it's signed as well.
Change-Id: Ib2622bd5c444ddcfa7fb2141f00332cbb4a0818b
Narayan Kamath [Mon, 24 Feb 2014 10:47:54 +0000 (10:47 +0000)]
Merge "Move system_properties over to C++."
Narayan Kamath [Wed, 19 Feb 2014 17:59:05 +0000 (17:59 +0000)]
Move system_properties over to C++.
This change constitutes the minimum amount of
work required to move the code over to C++, address
compiler warnings, and to make it const correct and
idiomatic (within the constraints of being called
from C code).
bug:
13058886
Change-Id: Ic78cf91b7c8e8f07b4ab0781333a9e243763298c
Elliott Hughes [Sat, 22 Feb 2014 00:10:10 +0000 (00:10 +0000)]
Merge "Fix a typo in HACKING.txt."
Elliott Hughes [Sat, 22 Feb 2014 00:09:27 +0000 (16:09 -0800)]
Fix a typo in HACKING.txt.
Change-Id: If1cc18776d873cb5966186b65b8831677df77aaf
Elliott Hughes [Fri, 21 Feb 2014 23:46:52 +0000 (23:46 +0000)]
Merge "Clean up our OpenBSD usage."
Elliott Hughes [Fri, 21 Feb 2014 02:04:58 +0000 (18:04 -0800)]
Clean up our OpenBSD usage.
Also undo some of the mess where we have OpenBSD <stdio.h> but a mix of
different BSD's implementations.
In this first pass, I've only moved easy OpenBSD stuff.
Change-Id: Iae67b02cde6dba9d8d06fedeb53efbfdac0a8cf6
Calin Juravle [Fri, 21 Feb 2014 17:09:13 +0000 (17:09 +0000)]
Merge "Fixed int fast types for LP64"
Calin Juravle [Thu, 20 Feb 2014 13:40:36 +0000 (13:40 +0000)]
Fixed int fast types for LP64
Bug:
13110474
Change-Id: Id5591603ad4ba7e149c0852f4abb25e4e5a5d065
Elliott Hughes [Thu, 20 Feb 2014 22:49:41 +0000 (22:49 +0000)]
Merge "Stop asking GCC to cause trouble."
Elliott Hughes [Thu, 20 Feb 2014 22:35:20 +0000 (14:35 -0800)]
Stop asking GCC to cause trouble.
Why do we see so many bogus strict-aliasing warnings? Because we asked GCC to
cause trouble on arm and mips.
Change-Id: I25d7fd036b6afff7ccfa799abe0dc1579ead2847
Elliott Hughes [Thu, 20 Feb 2014 22:23:21 +0000 (22:23 +0000)]
Merge "Move the upstream-netbsd libc files into the correct directory."
Elliott Hughes [Thu, 20 Feb 2014 22:15:09 +0000 (14:15 -0800)]
Move the upstream-netbsd libc files into the correct directory.
I screwed up when I originally imported these files; they're in lib/libc/
in the upstream tree; there is no top-level libc/ (though there is a top-level
common/, so those files stay where they are).
Change-Id: I7c5e2224a4441ab0e33616a855a8c6aacfeac46f
Elliott Hughes [Thu, 20 Feb 2014 22:14:35 +0000 (22:14 +0000)]
Merge "Remove two DNS files that weren't being built."
Elliott Hughes [Thu, 20 Feb 2014 22:13:17 +0000 (22:13 +0000)]
Merge "Unify our assembler macros."
Elliott Hughes [Thu, 20 Feb 2014 21:59:20 +0000 (13:59 -0800)]
Remove two DNS files that weren't being built.
And switch the makefile to just building everything in the relevant directory.
Change-Id: Ia7785c4dcabb51639c2230026f8a8a9eff919a36
Elliott Hughes [Thu, 20 Feb 2014 00:53:20 +0000 (16:53 -0800)]
Unify our assembler macros.
Our <machine/asm.h> files were modified from upstream, to the extent
that no architecture was actually using the upstream ENTRY or END macros,
assuming that architecture even had such a macro upstream. This patch moves
everyone to the same macros, with just a few tweaks remaining in the
<machine/asm.h> files, which no one should now use directly.
I've removed most of the unused cruft from the <machine/asm.h> files, though
there's still rather a lot in the mips/mips64 ones.
Bug:
12229603
Change-Id: I2fff287dc571ac1087abe9070362fb9420d85d6d
Elliott Hughes [Thu, 20 Feb 2014 19:58:23 +0000 (19:58 +0000)]
Merge "Fix mips64 crt build."
Elliott Hughes [Thu, 20 Feb 2014 19:57:25 +0000 (11:57 -0800)]
Fix mips64 crt build.
This was broken during the multi-arch makefile changes.
Change-Id: Id25cf3273f63c11fbca1cff944fc5e1bf765c636
Elliott Hughes [Thu, 20 Feb 2014 19:52:36 +0000 (19:52 +0000)]
Merge "Remove useless _C_LABEL from our assembler source."
Elliott Hughes [Thu, 20 Feb 2014 19:51:11 +0000 (11:51 -0800)]
Remove useless _C_LABEL from our assembler source.
Change-Id: I41a9181537c70ecc69ef8035132c9a83811a40d0
Elliott Hughes [Thu, 20 Feb 2014 19:41:15 +0000 (19:41 +0000)]
Merge "Stop advertising an arm32-specific hack like it's a build system feature."
Dmitriy Ivanov [Thu, 20 Feb 2014 19:40:08 +0000 (19:40 +0000)]
Merge "Added script generating additions to libgcc_compat.c from linker errors"
Elliott Hughes [Thu, 20 Feb 2014 19:36:55 +0000 (11:36 -0800)]
Stop advertising an arm32-specific hack like it's a build system feature.
Change-Id: I3a830b4a3516b6eb8e4f8e6e6b122a22a2e341df
Dmitriy Ivanov [Thu, 20 Feb 2014 01:23:24 +0000 (17:23 -0800)]
Added script generating additions to libgcc_compat.c from linker errors
bug:
12234455
Change-Id: Icac35237f06e75745da5a91d9c4c941d7df4f84d
Elliott Hughes [Thu, 20 Feb 2014 19:31:13 +0000 (19:31 +0000)]
Merge "Don't explicitly list the tzcode files."
Elliott Hughes [Thu, 20 Feb 2014 19:28:20 +0000 (11:28 -0800)]
Don't explicitly list the tzcode files.
Change-Id: I3ac19899523ac1f5fd2fdd6c942aefce75a964a4
Narayan Kamath [Thu, 20 Feb 2014 10:03:55 +0000 (10:03 +0000)]
Merge "Fix signbit / infinite / isinf / isnan unit tests."
Elliott Hughes [Thu, 20 Feb 2014 03:00:16 +0000 (03:00 +0000)]
Merge "Remove the useless _C_LABEL from generated system calls."
Elliott Hughes [Thu, 20 Feb 2014 02:59:19 +0000 (18:59 -0800)]
Remove the useless _C_LABEL from generated system calls.
Change-Id: Id1d2fd39972652831ea825f6f9cf940b08f42b5c
Elliott Hughes [Wed, 19 Feb 2014 23:40:46 +0000 (23:40 +0000)]
Merge "Linker writes to wrong memory location when processing DT_MIPS_RLD_MAP"
Elliott Hughes [Wed, 19 Feb 2014 23:35:31 +0000 (23:35 +0000)]
Merge "Make mips/mips64 syscall stubs more like the other architectures."
Elliott Hughes [Wed, 19 Feb 2014 22:58:04 +0000 (22:58 +0000)]
Merge "Top-level documentation about working on bionic."
Elliott Hughes [Wed, 19 Feb 2014 22:54:31 +0000 (14:54 -0800)]
Make mips/mips64 syscall stubs more like the other architectures.
Change-Id: I55f8c1a95f643a6e484f12fbcc25e2c77e55b6b8
Elliott Hughes [Wed, 19 Feb 2014 20:28:33 +0000 (20:28 +0000)]
Merge "Make mips generated assembler more like the mips64 stuff."
Elliott Hughes [Wed, 19 Feb 2014 20:20:00 +0000 (12:20 -0800)]
Make mips generated assembler more like the mips64 stuff.
I broke the mips build yesterday because it doesn't use
<private/bionic_asm.h> like the other architectures, including mips64.
I want to move mips closer to mips64 to try to avoid this kind of thing
in future.
Change-Id: Idb985587ff355b9e5e765c1f5671dc0144cd2488
Narayan Kamath [Wed, 19 Feb 2014 15:42:58 +0000 (15:42 +0000)]
Fix signbit / infinite / isinf / isnan unit tests.
Turns out stlport isn't broken. <cmath> (included
transitively via gtest in our case) is not required
to make C99 math macros (like signbit) available, nor is
it required to preserve them if they're already defined.
It is only required to make the equivalent functions in
namespace std available.
I couldn't find any documentation of required behaviour for
programs that include both <math.h> and <cmath>.
I've verified experimentally that llvm's libc++ and gnu
stl behave the same as stlport.
bug:
12935307
Change-Id: I9dc5cc0fd9f4f259abc8eefb280177cdd092a94b
Elliott Hughes [Wed, 19 Feb 2014 06:08:56 +0000 (22:08 -0800)]
Top-level documentation about working on bionic.
Change-Id: If0a531865fa9c0d57486b98d4b78e3efcbf4e1d1
Elliott Hughes [Wed, 19 Feb 2014 00:51:31 +0000 (00:51 +0000)]
Merge "Use uid_t and gid_t for st_uid and st_gid in struct stat."
Elliott Hughes [Wed, 19 Feb 2014 00:46:32 +0000 (00:46 +0000)]
Merge "Fix build by avoiding the _C_LABEL macro."
Elliott Hughes [Wed, 19 Feb 2014 00:43:31 +0000 (16:43 -0800)]
Use uid_t and gid_t for st_uid and st_gid in struct stat.
Change-Id: Ide62dc714d76d881e3aa79e7a59ee6533a23dd00
Elliott Hughes [Wed, 19 Feb 2014 00:42:36 +0000 (16:42 -0800)]
Fix build by avoiding the _C_LABEL macro.
Change-Id: Ide367c2b65071388bd95fbc81a4ed6ae94aec4e4
Benjamin Adolphi [Tue, 18 Feb 2014 23:50:32 +0000 (00:50 +0100)]
Linker writes to wrong memory location when processing DT_MIPS_RLD_MAP
When bionic's dynamic linker processes the .dynamic section of a MIPS ELF binary and encounters the DT_MIPS_RLD_MAP dynamic array tag, it calculates the address of where to write a pointer to the _r_debug structure. The current implementation simply reads the value given in the d_ptr field and writes the pointer address to that location. However, this value has to be adjusted to reflect the real load address of the binary. Otherwise the linker will write to a faulty location possibly resulting in a crash when linking a MIPS binary that includes DT_MIPS_RLD_MAP. This change corrects that problem.
Change-Id: I1a91874f7ab47289001fe72d9016660c14c70362
Signed-off-by: Benjamin Adolphi <b.adolphi@gmail.com>
Elliott Hughes [Tue, 18 Feb 2014 23:49:16 +0000 (23:49 +0000)]
Merge "Add missing file from previous change."
Elliott Hughes [Tue, 18 Feb 2014 23:48:56 +0000 (15:48 -0800)]
Add missing file from previous change.
Change-Id: Id25000162a9ed76ce756842bdc09fe9afff9528f