OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b45cd25 c9f9d09)
am c9f9d094: am 9c2df94f: (-s ours) am 00c64f7c: Merge "Add android.net.CaptivePortal...
authorPaul Jensen <pauljensen@google.com>
Thu, 27 Aug 2015 16:25:57 +0000 (16:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 16:25:57 +0000 (16:25 +0000)
* commit 'c9f9d094d09c7daa7a578c4e7105ab1d902eee34':


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help