Daniel Sandler c2c4f8d895 am 50ad6326: am 466b77e9: am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev ...

* commit '50ad6326c5814d092cf1510847bcdfb940a46738':
  New lockscreen: allow search gesture from nav bar.

2012-10-22 08:07:05 -07:00

..

java

am 50ad6326: am 466b77e9: am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev

2012-10-22 08:07:05 -07:00

jni

am 3786a9b9: am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev

2012-10-17 19:23:27 -07:00

res

am 01d2c64a: am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev

2012-10-19 11:07:12 -07:00

tests

am 9396f183: resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp

2012-10-19 17:20:03 -07:00