diff options
| author | Rom Lemarchand <romlem@google.com> | 2015-11-16 21:33:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-11-16 21:33:48 +0000 |
| commit | 5032e49f9e8ec8307dbc265a78649c2b49e4e5ad (patch) | |
| tree | aa0a94d31a322881bc92777d0d68374b200cf02c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 579cc90e61598c57a8225cbea4bfe035e5e1963c (diff) | |
| parent | 3b91bd21731de804af29d42d77b5c70d67838a4e (diff) | |
Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev
* changes:
resolved conflicts for 7de7e0b0 to stage-aosp-master
BatteryService: Add Max charging voltage
Stop setting swappiness.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions