am 3c6ee5b5: am d2bec096: Merge "NullPointerException in SQLiteSession"

# By László Dávid
# Via Android Git Automerger (1) and others
* commit '3c6ee5b509d6360a431290fff4b366848c293899':
  NullPointerException in SQLiteSession

core/java/android/database/sqlite/SQLiteSession.java

@@ -926,7 +926,7 @@ public final class SQLiteSession {
     }
 
     private void throwIfNestedTransaction() {
-        if (mTransactionStack == null && mTransactionStack.mParent != null) {
+        if (hasNestedTransaction()) {
             throw new IllegalStateException("Cannot perform this operation because "
                     + "a nested transaction is in progress.");
         }