commit 38fe166298f4252d445128da4b944f198ccf2abc
author Christopher Wiley <wiley@google.com> Tue Nov 10 22:33:25 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 10 22:33:25 2015 +0000
tree 9b1e4a57f6735d2e16fc41d015d770ee4fbc376d
parent e32c5a1f1db53fc38401ce8ef34907ad5112526b
parent 763f2f0c973de4d0fab173403a63a90bb17d62c5

Merge "libutils: Add UNEXPECTED_NULL status_t" am: 2f33e0cb17 am: 3a380b4843
am: 8831e30b5c

* commit '8831e30b5cdbdf20ccf95897e0e4dade37aa3134':
  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