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:
135b4fa
3cc7c4f
)
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev
author
Yueming Wang
<yuemingw@google.com>
Tue, 27 Mar 2018 10:30:37 +0000
(10:30 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 27 Mar 2018 10:30:37 +0000
(10:30 +0000)
am:
3cc7c4fc76
Change-Id: I2370b8cc9b5b730d2bf2c4f522d955e952f74bdb
Trivial merge