John Reck 02d1b0575f am 32493276: Merge "Add missing ifdefs" ...

* commit '32493276b96c0126d66d211576f5e505a957803a':
  Add missing ifdefs

2014-05-01 00:10:35 +00:00

..

java

am d404631d: am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"

2014-04-30 23:32:55 +00:00

jni

Merge "Add missing ifdefs"

2014-05-01 00:07:45 +00:00

res

am cf0244ce: am 006c2110: am 11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev

2014-04-30 23:40:42 +00:00

tests

am f0a3ea6e: am c6ebc0d1: Merge "make success explicit in BT instrumentation util" into klp-modular-dev

2014-04-29 23:12:16 +00:00