tree 0cdacbb1c1575d62892cab24fd6a3180649d532e
parent eb96adaa26585f15379389afdfa4c669ad3ffa86
parent fbd2c21f18ed1ba1b0af6fafc93601fce82b4058
author Amith Yamasani <yamasani@google.com> 1490725399 +0000
committer android-build-merger <android-build-merger@google.com> 1490725399 +0000

Merge "Catch IllegalArgumentException to avoid SyncManager crash" into oc-dev
am: fbd2c21f18

Change-Id: I228f8389c0459c6b1a3e7a211aae2ce4cbd9014a