tree ca15f503cdccfa0bb8dad85046e0c543a4a8df85
parent 5ab29051f12321e0c939c119c18017ffea7e323a
parent 7dda1047dd14cebd9099b3ba848064ff3721cc3d
author Michael Wright <michaelwr@google.com> 1417575629 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417575629 +0000

am 7dda1047: am e9860761: am 2503a62b: Merge "Have the MediaProjection sample use the callback." into lmp-mr1-dev

* commit '7dda1047dd14cebd9099b3ba848064ff3721cc3d':
  Have the MediaProjection sample use the callback.