tree 142ae0b61644dd3550f8ccbc290db7c70ed2ec7c
parent f764425576e03557752df2e8a8723ba59e546b4c
parent 3256d42cdd9254baf861b256379140d3c647a85e
author Andreas Huber <andih@google.com> 1346447307 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346447307 -0700

am 3256d42c: am cd89e801: Merge "Added an additional virtual method IStreamSource::flags()." into jb-mr1-dev

* commit '3256d42cdd9254baf861b256379140d3c647a85e':
  Added an additional virtual method IStreamSource::flags().