OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4bcf0d 6c8d6d7)
am cc85a9ed: resolved conflicts for merge of 66c16547 to lmp-sprout-dev Also fixed...
authorTyler Gunn <tgunn@google.com>
Sat, 13 Sep 2014 20:22:02 +0000 (20:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 13 Sep 2014 20:22:02 +0000 (20:22 +0000)
* commit 'cc85a9edce094412f0e4cac9b985abbf2d96f073':
  Renaming Telecomm to Telecom.


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