tree f85f9bf9d4d98b311e245bfa50fe76e2c0273795
parent ed7cfb67e7e697e544ac1220170af741e9e117d6
parent 04ed503e7bb5b4ab6ad1b4704a80ba4e217cf66f
author Yorke Lee <yorkelee@google.com> 1426782635 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1426782636 +0000

Merge "Make PhoneAccount.CAPABILITY_VIDEO_CALLING public"