OSDN Git Service

am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard...
authorAdam Lesinski <adamlesinski@google.com>
Wed, 3 Dec 2014 20:42:22 +0000 (20:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Dec 2014 20:42:22 +0000 (20:42 +0000)
* commit '72a6aeaca0712d9b72b9f773e2b72bb45ddd3cb8':
  AAPT: Add pathMotion custom classes to Proguard Keep set

1  2 
tools/aapt/Resource.cpp

Simple merge