OSDN Git Service

resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp
authorCraig Donner <cdonner@google.com>
Tue, 14 Jun 2016 00:45:06 +0000 (17:45 -0700)
committerCraig Donner <cdonner@google.com>
Tue, 14 Jun 2016 00:45:06 +0000 (17:45 -0700)
commit7aa838826c48fe0ec3c4a75e709316c87ce9aea5
tree8de2f7b2219a196b3f53a04fb7248a8016bc704f
parenta2db19c4cb0146713dca1aa6f1b3caf424809aba
parente1e1e75173d557466e824782c61802a8415c7073
resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp

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