OSDN Git Service

am a196e203: am 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synth...
authorAdam Lesinski <adamlesinski@google.com>
Fri, 26 Sep 2014 05:03:49 +0000 (05:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Sep 2014 05:03:49 +0000 (05:03 +0000)
* commit 'a196e203076cb810a21a702b41f6a1d82d029318':
  AAPT: Fix issue with synthesized resource not actually showing up

1  2 
tools/aapt/ResourceTable.cpp

Simple merge