OSDN Git Service

Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev
authorJeff Brown <jeffbrown@google.com>
Fri, 31 May 2013 00:54:41 +0000 (00:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 31 May 2013 00:54:41 +0000 (00:54 +0000)
1  2 
api/current.txt

diff --cc api/current.txt
Simple merge