am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev

* commit '0cd143adae642465a26a7eaac96030bb18826e94':
  AAPT: Fix regression in resource versioning

diff --cc tools/aapt/Android.mk
index 94a74c4,b991d55..769e2a1
--- 1/tools/aapt/Android.mk
--- 2/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@@ -51,8 -51,14 +51,9 @@@ aaptTests := 
      tests/AaptConfig_test.cpp \
      tests/AaptGroupEntry_test.cpp \
      tests/Pseudolocales_test.cpp \
-     tests/ResourceFilter_test.cpp
+     tests/ResourceFilter_test.cpp \
+     tests/ResourceTable_test.cpp
  
 -aaptCIncludes := \
 -    system/core/base/include \
 -    external/libpng \
 -    external/zlib
 -
  aaptHostLdLibs :=
  aaptHostStaticLibs := \
      libandroidfw \