diff options
author | Mitchell Wills <mwills@google.com> | 2015-08-04 22:12:30 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 22:12:30 +0000 |
commit | 992ae880743a49331ea0ab666f4fe3c8617750db (patch) | |
tree | cacf5a3d523f42b4b01ba6a86e8227308532dcf4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1c53d91e815fe281855a1ba5fa3944bcf67eba7c (diff) | |
parent | e8c888c41949c174f8cc244f8d705e675a2f3c30 (diff) |
am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
* commit 'e8c888c41949c174f8cc244f8d705e675a2f3c30':
Charge apps for wifi tx time while scanning
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions