summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-12-30 11:49:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-12-30 11:49:03 +0000
commit3d7c18abd0d93f49683a030caf55d7844ff86b27 (patch)
treefe9e91f1c27d17c6f5555e737df2b329b98fe7d9
parent2241931f86bca3812cf3d2552322b414928f6e03 (diff)
parente0bca041c21693c30290feb63121e408a85bc8b0 (diff)
downloadnist-pkits-3d7c18abd0d93f49683a030caf55d7844ff86b27.tar.gz
Merge "Use core-oj alongside core-libart wherever required."
am: e0bca041c2 * commit 'e0bca041c21693c30290feb63121e408a85bc8b0': Use core-oj alongside core-libart wherever required.
0 files changed, 0 insertions, 0 deletions