tree 9572acfb5dac9d5b69531c731f92ec89c8b6f77d
parent b349e09a1893d634bfa0c61543e98eebc5abae72
parent 5e1aa20225c6cd06d8076b6654312ff7a0de314c
author Igor Murashkin <iam@google.com> 1497496206 +0000
committer android-build-merger <android-build-merger@google.com> 1497496206 +0000

Merge "core: Move core.oat bootjar definitions into core/config"
am: 5e1aa20225

Change-Id: Iede6a5ad12024e083accede4757a4be33d678aee