Merge commit '037515476560b1277960d0bb781e4be5610558c0' into gingerbread-plus-aosp
* commit '037515476560b1277960d0bb781e4be5610558c0':
Assets moved to hdpi directory, mdpi version created
That's because GB uses the Tools_r& which do not have
hierarchyviewer2 so we should not try to pull the .bat from
hv2. We don't care since we'll ignore these old tools anyway
when packaging the final SDK.
Change-Id: Ie7d161bad59d6e919613db2e854f48964e59c4a9
Merge commit '4b96eff41cb69579f5e4da861f3821f1fd3a8924'
* commit '4b96eff41cb69579f5e4da861f3821f1fd3a8924':
Add a util function that converts Text ndef record to text.
Merge commit '9c1791134fd822a50a26c4c4164b0b2f5c67988f'
* commit '9c1791134fd822a50a26c4c4164b0b2f5c67988f':
Explain the bytes associated with the NFC type 4 tag.
Merge commit '68c3b4fca69235dd6b526e415fde6d8c0eeae79f'
* commit '68c3b4fca69235dd6b526e415fde6d8c0eeae79f':
Add initial support for saved vs non-saved tags.
Merge commit 'abe92c127e61ac4775a57d26d60273f58aaf0ceb'
* commit 'abe92c127e61ac4775a57d26d60273f58aaf0ceb':
cleanup unused classes, show date in tag list.
Merge commit 'feb2b3d9b02d7fd008bea09d14f175d848a62226' into gingerbread-plus-aosp
* commit 'feb2b3d9b02d7fd008bea09d14f175d848a62226':
Change date storage in DB to be a ms timestamp integral value.
Add a basic CursorAdapter to add more flexibility to views in list.
Create custom listview item that is pretty much the same, except
with a relative time string.
Change-Id: I9a1f956832f550b9a8192ea3967e732725dd6ba2
Merge commit '1d5707b5a864f5f154bc2de98f7c2027b8390387' into gingerbread-plus-aosp
* commit '1d5707b5a864f5f154bc2de98f7c2027b8390387':
Update Tag app for API changes.
Merge commit '5fed2354d2ffb374ea84641eed0fe287fb26c3ce' into gingerbread-plus-aosp
* commit '5fed2354d2ffb374ea84641eed0fe287fb26c3ce':
Clean up some resources:
- remove duplicated desk clocks since they were really the same icon.
- shrink down the tab indicator icons to a suitable size
- remove title bar from activity
Change-Id: I39ed7efb0e493a7ac037d6c06fa25eeb53d2332e
Merge commit '5b2f2912bcf4c1a9da9e8120d2788e31b484a848' into gingerbread-plus-aosp
* commit '5b2f2912bcf4c1a9da9e8120d2788e31b484a848':
Nuke author tags and update Manifest that I
Merge commit '14ca79d2a9f305abadcf98d4b3e579a4b79d78ab' into gingerbread-plus-aosp
* commit '14ca79d2a9f305abadcf98d4b3e579a4b79d78ab':
Minor JavaDoc additions and some long line fixes.
Merge commit '5e26d64d0907e403baf3c487191a4c5ffb48f74c' into gingerbread-plus-aosp
* commit '5e26d64d0907e403baf3c487191a4c5ffb48f74c':
disable proguard. This makes unittests run.
Merge commit '22ba58cfb88e1394b34dc40b83f3dbf5229b2fb1' into gingerbread-plus-aosp
* commit '22ba58cfb88e1394b34dc40b83f3dbf5229b2fb1':
Add a util function that converts Text ndef record to text.
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.
