am 4dcd1c49: (-s ours) am a115a8bc: Merge "DO NOT MERGE Change AVCTP revision to 1.4" into lmp-mr1-modular-dev

* commit '4dcd1c49b84414b950a2874156838b9556023afa':
  DO NOT MERGE Change AVCTP revision to 1.4
tree: 0d1f17566684dc7c2b3d08a8e9f913368eb3512a
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE