| commit | 5caebe4c7c8644b1dbf3fef23551373b95a8efd6 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Sep 20 17:37:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 20 17:37:20 2013 -0700 |
| tree | b8319a89fd466d69bd1c0dbcfbdeabe034521ff9 | |
| parent | 0325fc366a3b89bb1e7b2101f1e50adc0365c652 [diff] | |
| parent | bd842f96ed4a9b7887be4702828ea0034d66ef85 [diff] |
am bd842f96: am d8a84a86: Merge "Correct bitmap merging logic" into klp-dev * commit 'bd842f96ed4a9b7887be4702828ea0034d66ef85': Correct bitmap merging logic