tree a6c61c4188fe1e1a0bcf990cb37b09dc54b377af
parent efc9cfa89c27928a687ad31ca71739cf58b8e98f
parent 3de60852099db609ba1279bc6972f06b1f73713f
author Android Build Merger (Role) <android-build-merger@google.com> 1499376881 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499376881 +0000

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