OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1000a3 24863fa)
am 24863faa: Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev
authorRich Slogar <rslogar@google.com>
Thu, 30 Apr 2015 21:34:44 +0000 (21:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Apr 2015 21:34:44 +0000 (21:34 +0000)
* commit '24863faa05dc8934f790e13f8cf153c0edb4a32a':
  docs: studio 1.2 updates


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