OSDN Git Service

resolve merge conflicts of 0b546c4 to nyc-dev-plus-aosp
authorJesse Hall <jessehall@google.com>
Wed, 4 May 2016 18:43:31 +0000 (11:43 -0700)
committerJesse Hall <jessehall@google.com>
Wed, 4 May 2016 18:43:31 +0000 (11:43 -0700)
commit19e838ba3944f0a18c21fb396cfaf6c9f6db2c7b
treee95a6eb4098b2c7001c04c9f8112ce6337605c24
parent5e6b0dd52422134fe46f6e80ca479607368402c5
parent0b546c408686e4353dfe4b3a12be1048b966944d
resolve merge conflicts of 0b546c4 to nyc-dev-plus-aosp

Change-Id: I76408f38afc40816ae4cc7ef82d1250225d18032
libs/gui/Android.mk