tree a8bff078c4309eeaaaf175fd801278014634d567
parent c6567f74b3ad7f43a6752dfc23491a38a803ea91
parent 04e46929fc316d77426796435bdf13799798c7a8
author Andreas Huber <andih@google.com> 1365099155 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365099155 -0700

am 7a09d501: Merge "Removed rtp timestamp patching hack in ANetworkSession, advertise" into jb-mr2-dev

* commit '7a09d501fe339203a1a38b35dbc13dc0dc31dcf9':
  Removed rtp timestamp patching hack in ANetworkSession, advertise