| commit | defe4b3fdbd2bd9ec04496178a338e32f986228d | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Fri Mar 14 23:33:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 23:33:15 2014 +0000 |
| tree | 7dd77c97380a84a06d27cee5da58c602cda4982b | |
| parent | f8e4b61cefa7972de92ce3c6fbba6f99d0a0d7bc [diff] | |
| parent | 93d279f562e0fa41be11c25e16df483fd8093b88 [diff] |
am 93d279f5: (-s ours) am 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height * commit '93d279f562e0fa41be11c25e16df483fd8093b88': DO NOT MERGE - Fixed crash for odd image width/height