tree 8104f0d418e0a91939dc401df479c1756ce15bfb
parent 842f2d8ccf4a5675b30a85e41aa3c391195e644b
parent 0d28ba452fb8884f3dfeb20fab193be5343ec29e
author Yabin Cui <yabinc@google.com> 1456210005 +0000
committer android-build-merger <android-build-merger@google.com> 1456210005 +0000

resolve merge conflicts of e5d3d15cd2 to nyc-dev
am: 0d28ba452f

* commit '0d28ba452fb8884f3dfeb20fab193be5343ec29e':
  Fix integer overflows in recovery procedure.