OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f7d8d8b
636af7a
)
am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev
author
Jeff Brown
<jeffbrown@google.com>
Fri, 31 May 2013 01:00:08 +0000
(18:00 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 31 May 2013 01:00:08 +0000
(18:00 -0700)
* commit '
636af7a1cb90bb2f422bc85356d30f5b4e9342e6
':
Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge