diff options
author | Andreas Huber <andih@google.com> | 2013-04-25 16:57:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-25 16:57:31 -0700 |
commit | c540ea00f4763758c9c40594d1e086aeefda9b70 (patch) | |
tree | c34e228da5ecde54e8cca7544fa4e1080ed2e390 /media/libstagefright/wifi-display | |
parent | ab5254653ea9f3886487144e76173c0b6a00f3e1 (diff) | |
parent | 75f912ca9d8a03c91a421b80d96b81d87ef79d68 (diff) | |
download | frameworks_av-c540ea00f4763758c9c40594d1e086aeefda9b70.zip frameworks_av-c540ea00f4763758c9c40594d1e086aeefda9b70.tar.gz frameworks_av-c540ea00f4763758c9c40594d1e086aeefda9b70.tar.bz2 |
am 75f912ca: am dd309b97: Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev
* commit '75f912ca9d8a03c91a421b80d96b81d87ef79d68':
Handle the case where an asynchronous prepare was initiated and then
Diffstat (limited to 'media/libstagefright/wifi-display')
0 files changed, 0 insertions, 0 deletions