Adam Powell 055f001f76 am 45d2f164: am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev ...

* commit '45d2f164877a8bfd4e99666b00d56169b23ff979':
  Fix keyguard bugs

2012-10-31 19:41:55 -07:00

..

java

am 31dfff78: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev

2012-10-30 18:10:09 -07: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

am 45d2f164: am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev

2012-10-31 19:41:55 -07:00

tests

am 86e0d95d: Merge "Reattach header view after DPAD scroll."

2012-10-23 15:01:43 -07:00