tree dd32091a3df488590f4e48a439d14a8a6568f08e
parent 7ab1f8d74ed97a921af3083564be190aaa6ba3e6
parent 8d336d984a0068da5dc367a51cc9eef3f9c8f219
author Lukas Zilka <zilka@google.com> 1494264643 +0000
committer android-build-merger <android-build-merger@google.com> 1494264643 +0000

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

Change-Id: Ie975c0fbc33141fdfb2d640f76a281aa9e5cc7cd