[automerger skipped] Merge "Add device descriptor to AudioEffect constructor" am: 1f7f1a6160 am: 3b7ee69840 am: 1cb51991a6 -s ours
am skip reason: Change-Id If545532293e6b2de6817d731f8f0e085037e9f81 with SHA-1 2802c1ef2d is in history

Change-Id: I5ff0f2fd9016700f56b57ea8e0fa327ab3d13101
tree: 0471bca9812f371d4b882db6ca3c0fc638689fcb
  1. src/
  2. Android.bp
  3. CleanSpec.mk