Mike Lockwood 0958fb1068 am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1 ...

* commit '221830b93d6f35bcf20db2d34978392b43f44221':
  Add support for USB accessory serial numbers

2011-03-14 17:41:22 -07:00

..

config

…

java

am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1

2011-03-14 17:41:22 -07:00

jni

Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1

2011-03-11 16:31:55 -08:00

res

am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1

2011-03-14 15:39:37 -07:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00