commit 45409868318b8a273f3fbb395a0c4387840a80e6
author Dan Albert <danalbert@google.com> Wed Sep 16 17:55:15 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 16 17:55:15 2015 +0000
tree c171ac6e036caf962eb647499dff4941a1f168db
parent 2b1ec058eb50844fec9ef1ecd690778b6dac4309
parent 34e96e7efd1edf6778784b3ea64fc5308779e2d3

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

* commit '34e96e7efd1edf6778784b3ea64fc5308779e2d3':
  Add include guard into SampleIterator.h

media/libstagefright/include/SampleIterator.h

diff --git a/media/libstagefright/include/SampleIterator.h b/media/libstagefright/include/SampleIterator.h
index 7053247..2ef41ae 100644
--- a/media/libstagefright/include/SampleIterator.h
+++ b/media/libstagefright/include/SampleIterator.h
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#ifndef SAMPLE_ITERATOR_H_
+
+#define SAMPLE_ITERATOR_H_
+
 #include <utils/Vector.h>
 
 namespace android {
@@ -75,3 +79,4 @@
 
 }  // namespace android
 
+#endif  // SAMPLE_ITERATOR_H_