diff options
| author | Stuart Scott <stuartscott@google.com> | 2015-01-29 01:58:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-29 01:58:53 +0000 |
| commit | 8d702000a7291068e639a9954e03c36d66144449 (patch) | |
| tree | 69861d26cb2f1adbd14f1a9f45d4d6df4ef08241 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 820d5c52b7e65bffeb4291887f5a1011e7ce971e (diff) | |
| parent | f4e52360613d20dc8176ce8a37cb05ad904fad0d (diff) | |
Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev
automerge: f4e5236
* commit 'f4e52360613d20dc8176ce8a37cb05ad904fad0d':
Change getDeviceId to take phoneId.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions