OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e32e53b 8c4bad2)
am 8c4bad20: am 78011ba9: am de35f0d9: Merge "setCallbackType should be public for...
authorWei Wang <weiwa@google.com>
Tue, 19 May 2015 23:17:08 +0000 (23:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 May 2015 23:17:08 +0000 (23:17 +0000)
* commit '8c4bad200cc21cac3626bb1ab022448b85cc6a33':
  setCallbackType should be public for onlost/onfound apis

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