am a3b948e7: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit 'a3b948e727a38582b88f1d3c7b604c0e3712f04f':
  Revert "Change SurfaceControl setPosition to take floats"
  SurfaceFlinger: fix a couple NULL fence checks

...

This commit is contained in:

The Android Open Source Project 2013-03-04 19:10:09 +00:00 committed by Android Git Automerger

parent c64fcbed9f a3b948e727

commit 78191861ac

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available