| commit | 6484c0e0139dbdfd890f3142c1e333a4fc09f629 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Fri Sep 06 09:39:34 2013 -0700 |
| committer | Michael Wright <michaelwr@google.com> | Fri Sep 06 09:39:34 2013 -0700 |
| tree | 65639e92da984efdbdeebd3389393c96198e591b | |
| parent | abc1d89950aec7efed2e39dee7b13453050d1d5a [diff] | |
| parent | f17e8ee37917103f1e6f96fd323605cd754dfdb3 [diff] |
Merge addition of supports-input tag into master aapt has been moved out of f/b which caused merged conflicts in the original commit Conflicts: tools/aapt/Command.cpp Change-Id: I181ac6a3382eb4858110b30c64fc734a8af4929b