diff options
| author | John Reck <jreck@google.com> | 2015-05-14 14:51:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-14 14:51:06 +0000 |
| commit | a0f6b87bbbbc10700aa14d2c4d9191fe1f064a60 (patch) | |
| tree | ff8a7b2404f4903f5404a49b02cec6c2a052df53 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fa660f79e9551ca46efa6eaed26cff06095fbcd8 (diff) | |
| parent | 570b2052bb8eec8c510941b0a6d77262df28b922 (diff) | |
am 570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev
* commit '570b2052bb8eec8c510941b0a6d77262df28b922':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions