diff options
author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2019-11-25 15:09:41 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-25 15:09:41 -0800 |
commit | 37247c85a21d4d418f15c63e0d5534b3a947f70d (patch) | |
tree | f03405b5af7350854a1734c9227c822bf520b4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8adec1b5d90827c6af9dc9232a2be273d06c2900 (diff) | |
parent | 3dd27a29a61ca987d38b3162e893f058fc6cd4d9 (diff) |
[automerger skipped] Merge "Dynamically allocate objects in TelephonyRegistry upon ss <-> ds switch" am: de5e074ee7 am: 9e63a140d4
am: 3dd27a29a6 -s ours
am skip reason: change_id Iec56cc99f9e702ebdbbdd78ad5362de0ff4e3ff2 with SHA1 5d3546104e is in history
Change-Id: I9d99d5ec5cd2c70598168e41f2cb1da2c5f20500
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions