OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fcacc2 4d03d72)
am cdca7b1a: am 02986e35: Merge "Add VideoState member variable to InCallCall." into...
authorAndrew Lee <anwlee@google.com>
Tue, 15 Jul 2014 22:03:03 +0000 (22:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Jul 2014 22:03:03 +0000 (22:03 +0000)
* commit 'cdca7b1acd77145522c373f38e890d85e4044904':
  Add VideoState member variable to InCallCall.

1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help