summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorsj.cha <sj.cha@lge.com>2017-02-17 13:32:07 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-17 13:32:07 +0000
commit420505710473414a4e40bc6233c6bee94dc548e8 (patch)
tree07cb85043d323304cf1a96bb0b640e691b45a624 /tools/aapt2/java/JavaClassGenerator.cpp
parentdf3164993307158a849efa12dbc81fdd0c0b2127 (diff)
parent395f0de0dcd9bc596b85bdcf826f5603d3caf9e8 (diff)
Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570fe8 am: 3b92631a69 am: 10957727f5
am: 395f0de0dc Change-Id: Ib7e586a778c6fb9b920f0790e4b343c122250bb7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions