Martijn Coenen 7ea1ab60b0 Merge "Re-use "name" attribute for NFC AIDs."

2013-07-23 22:27:05 +00:00

..

java

Merge "Fix handling of ListPreference.setValue()"

2013-07-23 22:16:56 +00:00

jni

Merge "Add controller numbers for gamepads / joysticks"

2013-07-23 20:52:57 +00:00

res

Merge "Re-use "name" attribute for NFC AIDs."

2013-07-23 22:27:05 +00:00

tests

am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:53:27 -07:00