tree a6c61c4188fe1e1a0bcf990cb37b09dc54b377af
parent 7730f5ad862858072d569bafbc1ad178ecbd85a3
parent 3631c2ff1f1b41b472bb6346f157a3fc791cf050
author Android Build Merger (Role) <android-build-merger@google.com> 1499376664 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499376664 +0000

Merge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f" into stage-aosp-master am: dc17418da0" into oc-dev-plus-aosp am: 1692f4d8e4" into oc-dr1-dev-plus-aosp