am 87175f0b: Merge "Stop being silly."

* commit '87175f0b54e82321b2aee958e8e89455a7027443':
  Stop being silly.
This commit is contained in:
Elliott Hughes 2015-07-31 16:08:52 +00:00 committed by Android Git Automerger
commit 19d9b8fc7c

View file

@ -44,7 +44,6 @@ enum {
ALREADY_EXISTS = android::ALREADY_EXISTS,
DEAD_OBJECT = android::DEAD_OBJECT,
FAILED_TRANSACTION = android::FAILED_TRANSACTION,
JPARKS_BROKE_IT = android::JPARKS_BROKE_IT,
BAD_INDEX = android::BAD_INDEX,
NOT_ENOUGH_DATA = android::NOT_ENOUGH_DATA,
WOULD_BLOCK = android::WOULD_BLOCK,