OSDN Git Service

Merge "Add NDK Choreographer API headers" am: 78e7eb7 am: 920838f -s ours
authorMichael Wright <michaelwr@google.com>
Thu, 14 Apr 2016 20:22:14 +0000 (20:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Apr 2016 20:22:14 +0000 (20:22 +0000)
am: 254f092

* commit '254f092a1a97562d68f2c44cbea95da00c29ff80':
  Add NDK Choreographer API headers

Change-Id: Ibf176fdd2865715929e4c3e1cbabf4cfc5fd3d99


Trivial merge