Martijn Coenen b59dbedced am 4bcc8ee6: Merge "NFC: always upper-case parsed AIDs." into klp-dev ...

* commit '4bcc8ee682bb879f1020942be03616b506d2c802':
  NFC: always upper-case parsed AIDs.

2013-08-09 15:22:25 -07:00

..

java

Merge "NFC: always upper-case parsed AIDs." into klp-dev

2013-08-09 20:50:52 +00:00

jni

am 5adfb21e: am a0b320a6: Merge "Remove possible leak when exception occurred."

2013-08-09 15:04:06 -07:00

res

am 8ffe17ae: Merge "Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION." into klp-dev

2013-08-08 15:55:58 -07:00

tests

Merge "Simplify LinkPropertiesTest."

2013-08-08 02:54:29 +00:00