summaryrefslogtreecommitdiff
path: root/native/android/configuration.cpp
diff options
context:
space:
mode:
author Yorke Lee <yorkelee@google.com> 2015-05-14 17:32:44 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-05-14 17:32:45 +0000
commit0125d76fa37d26a29f06371ff349546e21cd3f4d (patch)
treea75194b667e880db3d736ef20af77af25641e846 /native/android/configuration.cpp
parentd674f2308aa1dd8f6f6df9d3cdd552e2aec0e64e (diff)
parentabfcfdc0444c48dd161e425c8417dab87de1cb69 (diff)
Merge "Make Conferenceable an abstract class" into mnc-dev
Diffstat (limited to 'native/android/configuration.cpp')
0 files changed, 0 insertions, 0 deletions