mike wakerly ee3151e0eb am 419a85e4: am 067bf854: am 2e7b11af: Merge "NfcAdapterExtras: expose driver name." into jb-mr1-dev ...

* commit '419a85e47e1dabb2cbcbd2f70a44a1a735610383':
  NfcAdapterExtras: expose driver name.

2012-10-03 16:56:23 -07:00

..

java

am 419a85e4: am 067bf854: am 2e7b11af: Merge "NfcAdapterExtras: expose driver name." into jb-mr1-dev

2012-10-03 16:56:23 -07:00

jni

am d8c6c6f5: am 1ca8d35f: am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev

2012-10-03 16:05:18 -07:00

res

am 3597ea1b: am b7843586: am 7ba4b482: Merge "Fix build" into jb-mr1-dev

2012-10-03 09:59:10 -07:00

tests

Merge "Pass the originating uid to the package verifier" into jb-mr1-dev

2012-09-28 10:58:19 -07:00