summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-07-12 19:27:39 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-12 19:27:39 +0000
commit6ae7a5f72b9bb62ce286423005bf1b0fe88f4f54 (patch)
tree5e474c0b4159c6e0a283c0c86f02023db8abcaec /tools/aapt2/java/JavaClassGenerator.cpp
parent7975dd5b482c5b86f53995e5b83768b62c14bc0d (diff)
parent76c9d707568e10d1d6560abed4511692db07b98f (diff)
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9
am: 76c9d70756 -s ours Change-Id: I860be1d599fe60603b37ba8388a20c44c37d6f68
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions