diff options
| author | Pavel Zhamaitsiak <pavelz@google.com> | 2014-12-18 01:34:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-18 01:34:21 +0000 |
| commit | a0fc9f2dd1820611295c6f83efec60c2a8f37eee (patch) | |
| tree | 82cbbff6be81ef1fc63cc044bb8f324f860f90d3 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 1e63f414ea7ecbe712e8b0dc493bb329f93e6031 (diff) | |
| parent | 3a35934540060441bc9f80cdf86b5013722553e2 (diff) | |
am 3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev
* commit '3a35934540060441bc9f80cdf86b5013722553e2':
IMS: Set phone account in IMS Conference object
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions