tree f9d2348fdf06258ca1084b9ecb982f959382ee1d
parent a059fc73533557df421d6c54124b4469a4e5d427
parent c5657b0c344b39d794c4c8241004d4e19341c096
author Andreas Gampe <agampe@google.com> 1415819579 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415819579 +0000

am c5657b0c: am fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"

* commit 'c5657b0c344b39d794c4c8241004d4e19341c096':
  Frameworks/native: Add pragmas to glgen headers