| commit | bd842f96ed4a9b7887be4702828ea0034d66ef85 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Sep 20 17:34:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 20 17:34:58 2013 -0700 |
| tree | 2b5b531e837093621c8d59f82e6bfbb30ee9bf51 | |
| parent | 12618bf7f58ec7a23c6e25db1eec41332727edf8 [diff] | |
| parent | d8a84a8609951826135a2e41a1cdd6b7cf680e27 [diff] |
am d8a84a86: Merge "Correct bitmap merging logic" into klp-dev * commit 'd8a84a8609951826135a2e41a1cdd6b7cf680e27': Correct bitmap merging logic