tree 9c8455a6d24ce072e4bd10421f2650db873b2c71
parent a7fb232462153307246b704c30998d9e088d2de5
parent 640e0827443fbdaed0e402b8af53cdad97d04bc6
author Makoto Onuki <omakoto@google.com> 1481831298 +0000
committer android-build-merger <android-build-merger@google.com> 1481831298 +0000

Fix failing test
am: 640e082744

Change-Id: Id8f5124b2d36e6abc39d0b14298bfdbc4de6787a