am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"

* commit '95306d85005f165e10a25ad45cadadec6e1f6a31':
  stagefright aacenc: Fix type definitions for 64 bit platforms
tree: 3e6d7b37be4c6d88bae65f86bbc0452fc2b567e3
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/