diff options
| author | Eric Laurent <elaurent@google.com> | 2012-03-20 18:20:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-20 18:20:31 -0700 |
| commit | 19b54cad221d205eebcb424c7f293422125fe12b (patch) | |
| tree | ac5274c5f00b1479283f17ea6122acb544579e03 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e5b2b644b1c48026cd3a58fb9267b708b774ae6a (diff) | |
| parent | 04353390722b9195434cc86af4414004eff058e8 (diff) | |
am 04353390: resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp
* commit '04353390722b9195434cc86af4414004eff058e8':
AudioTrack: relax check on minimum buffer size
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions