FEI WU 2787074c1b Update Switch track in SwitchPreference on watch am: 21f989f831 ...

am: 721a98b92a

Change-Id: I7e9003a86c2dd7db44cc575af5254e1497860be5

2016-09-15 11:57:04 +00:00

..

java

resolve merge conflicts of 4daa1b7 to master

2016-09-15 10:42:50 +01:00

jni

Merge "Request legacy mode behavior from SkCodec in BitmapFactory"

2016-09-14 14:21:59 +00:00

res

Update Switch track in SwitchPreference on watch am: 21f989f831

2016-09-15 11:57:04 +00:00

tests

Merge "Create test for factor value of ScaleGesture."

2016-09-13 07:16:30 +00:00