Martijn Coenen a603f083ff am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev ...

* commit '2bf6529bf8f81d1b9f0ff103f12d004937d0f59f':
  Verify NFC permission immediately on API calls.

2014-11-20 18:05:04 +00:00

..

java

am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev

2014-11-20 18:05:04 +00:00

jni

Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev

2014-11-19 23:55:52 +00:00

res

am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev

2014-11-20 18:04:54 +00:00

tests

Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev

2014-11-13 00:33:00 +00:00