Jean-Baptiste Queru 8d3d0250c4 Merge commit '432c71d77e376c948b6e287b2b6b2d134e1f2a11' ...

Change-Id: Iafcba7225e662bc2c3a3c113a1b36656889e2f18

2012-11-08 14:40:12 -08:00

..

java

Merge commit '432c71d77e376c948b6e287b2b6b2d134e1f2a11'

2012-11-08 14:40:12 -08:00

jni

am 39c68da5: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev

2012-10-23 15:27:10 -07:00

res

merge 19f8aa180a7ccb29b11a322378002e37517abfc9

2012-11-08 14:13:21 -08:00

tests

am f1e32af5: am c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev

2012-10-31 21:23:31 -07:00