am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
tree: 4d54436f9d0ed116b921d5814a684707bf370210
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/