diff options
| author | Peter Ng <petergng@google.com> | 2011-10-21 17:00:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-21 17:00:04 -0700 |
| commit | 5eefe4e20079515c140d2186556f3e308e6a5f73 (patch) | |
| tree | 99ff95198a269a183f8f5041d1deb6e1426bb313 /tools/aidl/generate_java_rpc.cpp | |
| parent | 08896e72c53e5d790b2d542436bca99c640a673b (diff) | |
| parent | cfb9df6710b3bbb60dcd06bd65fb9ad1304cd348 (diff) | |
am cfb9df67: (-s ours) am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0
* commit 'cfb9df6710b3bbb60dcd06bd65fb9ad1304cd348':
Do not merge - Recents background protection increased
Diffstat (limited to 'tools/aidl/generate_java_rpc.cpp')
0 files changed, 0 insertions, 0 deletions