commit 557b64abad9915f92a9d35c748766e873f3a29fd
author Paul Lawrence <paullawrence@google.com> Thu Nov 05 22:19:52 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 05 22:19:52 2015 +0000
tree b5a4689740b599bcd26982e67ef259dbdf6c8476
parent b88b69a792c7224d07f25f258b24fce91fc54472
parent 6bcc32504f3b9c40b33718599a6ff8186a9669f4

Merge "Fix build"

core/java/android/os/storage/IMountService.java

diff --git a/core/java/android/os/storage/IMountService.java b/core/java/android/os/storage/IMountService.java
index bc013eb..5d45ade 100644
--- a/core/java/android/os/storage/IMountService.java
+++ b/core/java/android/os/storage/IMountService.java
@@ -1365,7 +1365,7 @@
 
         static final int TRANSACTION_isPerUserEncryptionEnabled = IBinder.FIRST_CALL_TRANSACTION + 64;
 
-        static final int TRANSACTION_isConvertibleToFBE = IBinder.FIRST_CALL_TRANSACTION + 64;
+        static final int TRANSACTION_isConvertibleToFBE = IBinder.FIRST_CALL_TRANSACTION + 65;
 
         /**
          * Cast an IBinder object into an IMountService interface, generating a