tree e2e502e9bbf6adc0e4984dfd9c22be960f5f559e
parent bb43d5e297405eeba4e5166758162dc8b71da678
parent 8afd952d482c36eefffd2144e4f771f1c1713690
author Andreas Huber <andih@google.com> 1492143480 +0000
committer android-build-merger <android-build-merger@google.com> 1492143480 +0000

Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev
am: 8afd952d48

Change-Id: If26dc4c5bb23ea23ed48d35aa8618e0b7f2825a3