am ff52e23f: Merge "Stop being silly."

* commit 'ff52e23f0327ec1b68495e84f7e42e7c3a3d3f0e':
  Stop being silly.
This commit is contained in:
Elliott Hughes 2015-08-06 17:29:49 +00:00 committed by Android Git Automerger
commit 802c6fd090

View file

@ -58,7 +58,6 @@ enum {
ALREADY_EXISTS = -EEXIST, ALREADY_EXISTS = -EEXIST,
DEAD_OBJECT = -EPIPE, DEAD_OBJECT = -EPIPE,
FAILED_TRANSACTION = (UNKNOWN_ERROR + 2), FAILED_TRANSACTION = (UNKNOWN_ERROR + 2),
JPARKS_BROKE_IT = -EPIPE,
#if !defined(HAVE_MS_C_RUNTIME) #if !defined(HAVE_MS_C_RUNTIME)
BAD_INDEX = -EOVERFLOW, BAD_INDEX = -EOVERFLOW,
NOT_ENOUGH_DATA = -ENODATA, NOT_ENOUGH_DATA = -ENODATA,