Merge commit '8149e89466644930069887527143d20cc7c91cfc' into gingerbread-plus-aosp
* commit '8149e89466644930069887527143d20cc7c91cfc':
Create a ParsedNdefMessage class with supporting implementations.
Merge commit '5bd2e0dbe64c9f3b64edc84900b60691d834cabb'
* commit '5bd2e0dbe64c9f3b64edc84900b60691d834cabb':
Change date storage in DB to be a ms timestamp integral value.
KeyEvent now offers an (@hidden) method to map keycodes to symbolic names
in a way that is compatible with what Monkey was already doing itself.
Now we shouldn't need to change monkey each time we add new keycodes.
Bug: 2912307
Change-Id: I9cd729b17c3f19505a4d3afcce465dad0c64cce0
Merge commit '1d583d99cf2cc8eb7bd77492a5823122f3197436'
* commit '1d583d99cf2cc8eb7bd77492a5823122f3197436':
Nuke author tags and update Manifest that I
Merge commit '4f3dcc857e002d1b5611d0b00bb787eec6318967' into gingerbread-plus-aosp
* commit '4f3dcc857e002d1b5611d0b00bb787eec6318967':
Revert "Add utility for toggling settings from the cmd line."
Merge commit '85122d2605a22c8e7bcde868c2b7a7d8d744e613' into gingerbread-plus-aosp
* commit '85122d2605a22c8e7bcde868c2b7a7d8d744e613':
add some new mock ndef messages for testing.
Merge commit '4f6f93d594791461d0a1df299800a3b238cdc1fc' into gingerbread-plus-aosp
* commit '4f6f93d594791461d0a1df299800a3b238cdc1fc':
Checkpoint work on the Tag app.
Merge commit 'c3fd52ed00409e99fdcb6ac28754e79613410470'
* commit 'c3fd52ed00409e99fdcb6ac28754e79613410470':
Minor JavaDoc additions and some long line fixes.
Merge commit '5b599c31481633e4f4277a125eeae6ea47600b02' into gingerbread-plus-aosp
* commit '5b599c31481633e4f4277a125eeae6ea47600b02':
Add utility for toggling settings from the cmd line.
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
