tree 60b551d2f4c46b6c3f5b187160f31b44ba54f641
parent c586bb646f6ee5fc9ddcafdd4797c87a501028c1
parent 565e978e80d693c077ec71caf45f6e06636a1a11
author Jorge Lucangeli Obes <jorgelo@google.com> 1470414110 +0000
committer android-build-merger <android-build-merger@google.com> 1470414110 +0000

Fix soft-fail on Android.
am: 565e978e80

Change-Id: Ifc7e4b93e3dbf63480a0b07fea11c2fd1fd0d9a2