]> git.saurik.com Git - android/aapt.git/commitdiff
Merge "Adding a line for android-debuggable to 'dump badging' if AndroidManifest...
authorDan Morrill <morrildl@google.com>
Wed, 11 Apr 2012 00:13:17 +0000 (17:13 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Apr 2012 00:13:17 +0000 (17:13 -0700)
1  2 
Command.cpp

diff --cc Command.cpp
Simple merge