OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 579cc90 3b91bd2)
Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev
authorRom Lemarchand <romlem@google.com>
Mon, 16 Nov 2015 21:33:48 +0000 (21:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 16 Nov 2015 21:33:48 +0000 (21:33 +0000)
* changes:
  resolved conflicts for 7de7e0b0 to stage-aosp-master
  BatteryService: Add Max charging voltage
  Stop setting swappiness.


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