diff options
author | Matthew Xie <mattx@google.com> | 2015-02-09 22:22:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-09 22:22:29 +0000 |
commit | be96280fdad21a4687f19c3deb95fc2a5ceb630d (patch) | |
tree | bf134aa039fae84c3f048a664fcb1356ea81a9b3 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 7d85bc4c435bc37284a814fb8baf53980396ab5b (diff) | |
parent | a96869fc1323faa5989803c5235c4c28e1094a16 (diff) |
am a96869fc: am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
* commit 'a96869fc1323faa5989803c5235c4c28e1094a16':
Separate the protection of mProxyServiceStateCallbacks from that of mService
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions