diff options
author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2018-11-07 13:10:36 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-11-07 13:10:36 -0800 |
commit | e4df471c9d8337c486c913e2168ec6d9e5bf0db9 (patch) | |
tree | 9663cde1bda04c9e75751bf338fd6dbd18bab06a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | bc120bcce69ddccf5ff4e14ef849f5c53b42563f (diff) | |
parent | 83048a884145361d49835bbe4b6cfe4d780e2296 (diff) |
[automerger skipped] Merge "Changing setPreferredData so that it takes subId." am: fbc4e55540 am: 2a0bb8b78a
am: 83048a8841 -s ours
Change-Id: I9c5f120fb1b22dfffd3953907faeb2635c0b0970
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions