OSDN Git Service

resolved conflicts for 5b5c81c4 to stage-aosp-master
authorColin Cross <ccross@android.com>
Sat, 19 Sep 2015 17:37:05 +0000 (10:37 -0700)
committerColin Cross <ccross@android.com>
Sat, 19 Sep 2015 17:38:39 +0000 (10:38 -0700)
commitd1ddf29901aef92e53e420e9937e9a4937569b9d
tree0f153da9c646cdc67d0432e5a248b1d713848674
parent7944e8ad6737309d0f64d180a450eaeebfc9865f
parent5b5c81c4969c812976ad219a8513d91708981426
resolved conflicts for 5b5c81c4 to stage-aosp-master

Change-Id: I0be665105d46cb3b934cb00890822d4dfae18f64
opengl/libs/Android.mk