am 8eed5d8b: am fae100f9: am a3ce6bdb: Merge "Fix LOG_ID_CRASH build failure."

* commit '8eed5d8bca6a3a2810bce17c2316ad44a3daa191':
  Fix LOG_ID_CRASH build failure.
This commit is contained in:
Elliott Hughes 2014-05-08 18:31:14 +00:00 committed by Android Git Automerger
commit b91610c95a

View File

@ -53,14 +53,15 @@ enum {
};
enum {
LOG_ID_MIN = 0,
LOG_ID_MIN = 0,
LOG_ID_MAIN = 0,
LOG_ID_RADIO = 1,
LOG_ID_EVENTS = 2,
LOG_ID_SYSTEM = 3,
LOG_ID_MAIN = 0,
LOG_ID_RADIO = 1,
LOG_ID_EVENTS = 2,
LOG_ID_SYSTEM = 3,
LOG_ID_CRASH = 4,
LOG_ID_MAX
LOG_ID_MAX
};
struct abort_msg_t {