commit 17104d3f79391d917b03cd774f0e19611056e283
author Christopher Wiley <wiley@google.com> Tue Nov 10 22:26:15 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 10 22:26:15 2015 +0000
tree 0c79de8f500978281ea3eaec3e02b9acd89cbaf0
parent 23ab600c75de449a798497486c4fb5a4122a0d19
parent 0f661083e763d89522211dec883775afa72daf95

Merge "libutils: Add UNEXPECTED_NULL status_t"
am: 2f33e0cb17

* commit '2f33e0cb179de6fe0aa9d50effa73fe00c7a8d24':
  libutils: Add UNEXPECTED_NULL status_t

include/utils/Errors.h

diff --git a/include/utils/Errors.h b/include/utils/Errors.h
index 08ddcd2..16e1fa2 100644
--- a/include/utils/Errors.h
+++ b/include/utils/Errors.h
@@ -72,6 +72,7 @@
     UNKNOWN_TRANSACTION = (UNKNOWN_ERROR + 6),
 #endif    
     FDS_NOT_ALLOWED     = (UNKNOWN_ERROR + 7),
+    UNEXPECTED_NULL     = (UNKNOWN_ERROR + 8),
 };
 
 // Restore define; enumeration is in "android" namespace, so the value defined