Rubin Xu 3ba5331a83 resolve merge conflicts of 4daa1b7 to master ...

Change-Id: I5292c074234fccc26c7a843f56eb68edce26d678

2016-09-15 10:42:50 +01: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

Merge "Add key to CarrierConfig"

2016-09-14 21:27:29 +00:00

tests

Merge "Create test for factor value of ScaleGesture."

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