tree 4ab739463b1a30463aa3b6946439fabbb1973882
parent b14ccf228cab22e471ad400445210e6fe807cf20
parent 99405e1f8fb6d9e33f8791a54dd9416754caf573
author Dan Albert <danalbert@google.com> 1442425251 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442425251 +0000

am 99405e1f: am 97ed4e73: Merge "Add include guard into SampleIterator.h"

* commit '99405e1f8fb6d9e33f8791a54dd9416754caf573':
  Add include guard into SampleIterator.h