tree 522f85faa8a80d4f86d0659b7694d871bc160953
parent 56df4108bb6b34602fb2fad4f073b710e4494071
parent 2352a815fe99a00702dd00c5d1c6cfdfadba10fd
author Jeff Brown <jeffbrown@google.com> 1346113176 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346113176 -0700

am 2352a815: Merge "Use new surface flinger API." into jb-mr1-dev

* commit '2352a815fe99a00702dd00c5d1c6cfdfadba10fd':
  Use new surface flinger API.