| commit | eed03e7b162a57435f73d98384efc5921fce8673 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Tue Feb 23 06:53:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 23 06:53:47 2016 +0000 |
| tree | b12a0e6ddf26cefc7c46948d23bc4489fd79a892 | |
| parent | e8a0a6d0d65d90dd9b288c8994f8be23260b9d44 [diff] | |
| parent | 80563ee93a46479dfa30a1ee5fbcc9a94e528931 [diff] |
resolve merge conflicts of e5d3d15cd2 to nyc-dev am: 0d28ba452f am: 80563ee93a -s ours * commit '80563ee93a46479dfa30a1ee5fbcc9a94e528931': Fix integer overflows in recovery procedure.