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:
111cc9f
d3b9fd3
)
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev
author
Erik Kline
<ek@google.com>
Tue, 28 Oct 2014 07:53:36 +0000
(07:53 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 28 Oct 2014 07:53:37 +0000
(07:53 +0000)
1
2
core/java/android/net/LinkProperties.java
patch
|
diff1
|
diff2
|
blob
|
history
core/tests/coretests/src/android/net/LinkPropertiesTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/net/LinkProperties.java
Simple merge
diff --cc
core/tests/coretests/src/android/net/LinkPropertiesTest.java
Simple merge