commit | 9046197f1f50b7ba3a3ee64e63f44c6246a9e085 | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Fri Dec 06 16:11:23 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 06 16:11:23 2013 +0000 |
tree | d48d195c320ebd60b898447f1c5dc8cd4509d233 | |
parent | 15a72bfa59fa71cce080044706a180cc2abc1ab8 [diff] | |
parent | cfaf3e4641f003bdb304e85979f6a92af008b0d5 [diff] |
am cfaf3e46: (-s ours) am 9d579988: (-s ours) am cfdbdd37: (-s ours) am 8de40076: (-s ours) Merge "DO NOT MERGE - Provide a mechanism for adjusting RSCompilerDriver after construction." * commit 'cfaf3e4641f003bdb304e85979f6a92af008b0d5':