tree 12a96645cdce97fc4626ea2a66f943b2e3a27261
parent 6750d499d2d9398f666037660da56960eb37716c
parent ad5e111650419aa42b2a099c6b4bfa4fa3a6f2d3
author Divya Sharma <c_shard@codeaurora.org> 1446658029 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658029 -0800
mergetag object ad5e111650419aa42b2a099c6b4bfa4fa3a6f2d3
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052350 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAf4ACgkQ6K0/gZqxDnghyACfSeGrRC3Oj1U/9fGYptAi8TvC
 xzkAoIHe7ZMN9WCTZyZHmlD9VaTbBpRT
 =ob9W
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Add pcm_get_poll_fd
  Export pcm_mmap_avail
  initialize pcm_config to zero

Change-Id: I5f1139095b87e178b51f9f346442d105b36af52a