OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a40eb5d 9c9a3af)
am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
authorRich Slogar <rslogar@google.com>
Tue, 17 Feb 2015 22:13:37 +0000 (22:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Feb 2015 22:13:37 +0000 (22:13 +0000)
* commit '9c9a3afb95dcac7bf356edf25c8d86187ea59afd':
  docs: studio proxy setting setup
  docs: studio proxy setup


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