OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f77a0e7
baaa4ef
)
am 3c95cae1: Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev
author
Wink Saville
<wink@google.com>
Wed, 3 Sep 2014 23:22:36 +0000
(23:22 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 3 Sep 2014 23:22:36 +0000
(23:22 +0000)
* commit '
3c95cae1ab33a0fd3bd93422e91a8182bf49d017
':
Rename getActivatedXxx to getActiveXxx
1
2
telephony/java/android/telephony/SubscriptionManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
telephony/java/android/telephony/SubscriptionManager.java
Simple merge