OSDN Git Service

Merge "Add NDK Choreographer API headers" am: 78e7eb7
authorMartijn Coenen <maco@google.com>
Thu, 14 Apr 2016 09:56:37 +0000 (09:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Apr 2016 09:56:37 +0000 (09:56 +0000)
commit254f092a1a97562d68f2c44cbea95da00c29ff80
tree0f295d63891bedcb062f32f470ec520ffd25650c
parent2b92836b83ee2c7e809f6af4e36743312b652407
parent920838f53eb73e0133b07098633357f7a2c2bad6
Merge "Add NDK Choreographer API headers" am: 78e7eb7
am: 920838f  -s ours

* commit '920838f53eb73e0133b07098633357f7a2c2bad6':
  Add NDK Choreographer API headers

Change-Id: Ic7bb76555186306c43e593a585f066bf3b72c6c7