OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 393abb1 be4536d)
am be4536d2: Merge "Adding matching @deprecated."
authorIan Rogers <irogers@google.com>
Tue, 23 Apr 2013 16:15:58 +0000 (09:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Apr 2013 16:15:58 +0000 (09:15 -0700)
* commit 'be4536d214eedc3d12b50f0f30b47bba773b8dbc':
  Adding matching @deprecated.

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