diff options
| author | Victoria Lease <violets@google.com> | 2012-10-29 17:15:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-29 17:15:23 -0700 |
| commit | edc739db0181770bf72c72d7118f1e0afd5d1a95 (patch) | |
| tree | 908d4744a3749b491e68b7b9500d77cf0f4c64bd /tools/aidl/generate_java.cpp | |
| parent | 0878d96a87c78d28223fa91eb514144d4f5e6dfc (diff) | |
| parent | 9348d76098c941ecaf8b114dc98933e511e3f556 (diff) | |
am 9348d760: am 4f5561b7: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev
* commit '9348d76098c941ecaf8b114dc98933e511e3f556':
Revert "make FLP play nicely with multiuser"
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions