| commit | 152d353e875d1d00d7e64d3b881fca74c4500e67 | [log] [tgz] |
|---|---|---|
| author | Rom Lemarchand <romlem@google.com> | Mon Nov 16 21:43:06 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 16 21:43:06 2015 +0000 |
| tree | f3a8f221b559a788dbd328cfcc6e0613e1d64f3d | |
| parent | e1cbe99e5ff222f5d017af83466793209e668ed7 [diff] | |
| parent | 5032e49f9e8ec8307dbc265a78649c2b49e4e5ad [diff] |
Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev am: 5032e49f9e * commit '5032e49f9e8ec8307dbc265a78649c2b49e4e5ad': resolved conflicts for 7de7e0b0 to stage-aosp-master BatteryService: Add Max charging voltage Stop setting swappiness.