| commit | 3cdd215075419cc5f43bbe4295ff2222dc388cfc | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Thu Aug 27 20:36:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:36:31 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | 5890ed1c6a5589cc1901fbbc848f2e698bad64c8 [diff] | |
| parent | a9a3eb48b37bfdf21dd4e1d4aa1d3443957a7055 [diff] |
am a9a3eb48: am 881d59b6: (-s ours) am ecff57d7: (-s ours) am aaf36e2f: Merge "don\'t trigger an integer underflow when decrementing." * commit 'a9a3eb48b37bfdf21dd4e1d4aa1d3443957a7055':