Esteban Talavera ae4af39504 am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev ...

* commit 'a2cdeadd322a1d2cb0778fa44eee61fcd0aa1e41':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC

2014-08-21 15:12:05 +00:00

..

java

Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev

2014-08-21 14:58:18 +00:00

jni

Merge "Add bounds checking to nine patch scaling" into lmp-dev

2014-08-21 00:16:54 +00:00

res

am e34fef3b: Don\'t stack toasts for every user press

2014-08-21 14:15:03 +00:00

tests

follow up minor fixes for connectivity manager test

2014-08-20 17:40:18 -07:00