tree 5ced2993bc8619db383e8bdceeb840997973c6fd
parent a6c78511cb571bf3992d63d80f4868c00dadce1c
parent 47c9e5861f24301980220e1de5661db6b19842aa
author Lukas Zilka <zilka@google.com> 1494264462 +0000
committer android-build-merger <android-build-merger@google.com> 1494264462 +0000

Fixes mismatch between Java and C++ indices.
am: 47c9e5861f

Change-Id: I418e76ea0041df6a65c6e635737fdbb0743c0915