commit 5403b3eaa1e1e8bef376d600118cf3fd501c690a
author Xin Li <delphij@google.com> Wed Nov 15 01:18:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 15 01:18:28 2017 +0000
tree a888edb67013303a7d107e6a6193808f0d804212
parent 4c46fb1043906541a277035960c184289856202b
parent 2e028b4e39b5f04bae70f0c3300bd2b79599f022

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 2e028b4e39

Change-Id: I4b976ed6b15db4bfb5757bd974fb8e7737a69dc0

include/telephony/ril.h

diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index 1c29fd3..efc3f72 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -2400,8 +2400,8 @@
  *  SUCCESS
  *  RADIO_NOT_AVAILABLE (radio resetting)
  *  PASSWORD_INCORRECT
- *     (code is invalid)
  *  SIM_ABSENT
+ *     (code is invalid)
  *  INTERNAL_ERR
  *  NO_MEMORY
  *  NO_RESOURCES
@@ -3054,7 +3054,7 @@
  *    RADIO_NOT_AVAILABLE, OP_NOT_ALLOWED_BEFORE_REG_TO_NW,
  *    OP_NOT_ALLOWED_DURING_VOICE_CALL, REQUEST_NOT_SUPPORTED,
  *    INVALID_ARGUMENTS, INTERNAL_ERR, NO_MEMORY, NO_RESOURCES,
- *    SIM_ABSENT and CANCELLED
+ *    CANCELLED and SIM_ABSENT
  *
  * See also: RIL_REQUEST_DEACTIVATE_DATA_CALL
  */