Merge commit 'e0890ff4bc95c63104a00df66f69b0ccd7ed15d7' into gingerbread-plus-aosp
* commit 'e0890ff4bc95c63104a00df66f69b0ccd7ed15d7':
Explain the bytes associated with the NFC type 4 tag.
Merge commit '21995b188899d9576ef8c5d26f0cc9e373804204' into gingerbread-plus-aosp
* commit '21995b188899d9576ef8c5d26f0cc9e373804204':
Add initial support for saved vs non-saved tags.
Merge commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee' into gingerbread-plus-aosp
* commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee':
cleanup unused classes, show date in tag list.
Merge commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd' into gingerbread-plus-aosp
* commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd':
Update OBB sample to revised API
Merge commit '4a74a386066d2eb86b64ffdf09391def0451e4be' into gingerbread-plus-aosp
* commit '4a74a386066d2eb86b64ffdf09391def0451e4be':
get rid of sql finalizer error messages.
Merge commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58' into gingerbread-plus-aosp
* commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58':
bytes should be a blob.
Merge commit '3c72deb3f4f087a3f7b8915301277b9e26b286e3' into gingerbread-plus-aosp
* commit '3c72deb3f4f087a3f7b8915301277b9e26b286e3':
ndk: remove undefined symbols from system headers
Merge commit '59b02d0eff9fb11ea6607a90db3752fe76f250d5' into gingerbread-plus-aosp
* commit '59b02d0eff9fb11ea6607a90db3752fe76f250d5':
Update win_sdk to put binaries in SDK/platform-tools.
This change removes the declaration of functions that are not
implemented by our various versions of our C library.
The corresponding declarations are moved inside #if 0 .. #endif
blocks (so it becomes easy to remember that they are missing)
Also refresh the headers a little (i.e. adding a few missing decl
and macros, remove C++ comments, etc)
See http://code.google.com/p/android/issues/detail?id=7807
Change-Id: I4ae1b1f3a181419eee2004c41b54768cc15e896f
NOTE: The missing decl are still there but encased in #if 0 .. #endif
blocks (to make it easier to implement them later). There are
a few exceptions in order to build STLport and libstdc++-v3
properly.
Includes bitmap.h which was missing from v9 but was previously in v8.
Also includes new obb stuff and other things that have gotten out of sync.
Change-Id: I6cf9ccdbc9d3271a34a1cf8a1de78aa8a1757276
This change updates various system libraries to reflect changes that
happened during distinct platform releases. All details are in the
file bionic/libc/docs/CHANGES.TXT, but the summary is:
API level 5:
pthread.h:
pthread_mutex_lock_timeout_np()
pthread_cond_timedwait_monotonic_np()
pthread_cond_timedwait_relative_np()
API level 8:
pthread.h:
pthread_condattr_init()
pthread_condattr_destroy()
pthread_condattr_setpshared()
pthread_condattr_getpshared()
dlfcn.h:
dladdr()
sched.h:
clone()
signal.h:
killpg()
stdio.h:
fdprintf()
vfdprintf()
unistd.h:
getusershell()
setusershell()
endusershell()
wchar.h:
mbstowcs()
wcstombs()
time.h:
timezone
daylight
plus symbols from new headers: <fts.h>, <regex.h>, <err.h>, <warn.h>
Change-Id: I7ff1ffa2cb37b71473b1d137c7799f17d644ab63
Merge commit '9f62c24a68e5408e5792fb185ab2e58d0c507265' into gingerbread-plus-aosp
* commit '9f62c24a68e5408e5792fb185ab2e58d0c507265':
Show 'Save tag' dialog even if the screen is turned off
Merge commit 'ce6bbfae018b5629fd86c77b81fc4d8c655fa275' into gingerbread-plus-aosp
* commit 'ce6bbfae018b5629fd86c77b81fc4d8c655fa275':
More data for testing.
I managed to extract data from a real NFC tag. Make that
data available for unittests / other testing.
Change-Id: I99cd8d6a32dc20fd7e33191f86def71236474d9a
Merge commit '97d3699cd92e2c15623935d723f1b85ec673b73a' into gingerbread-plus-aosp
* commit '97d3699cd92e2c15623935d723f1b85ec673b73a':
Have TagBroadcastReceiver start the SaveTag activity.
