Jordan Liu 0672ea446d resolve merge conflicts of a578ae2 to stage-aosp-master ...

am: cee0c941ed

Change-Id: I39f3256a13117c2afe6872f58f57c18c308eab30

2016-12-01 00:00:55 +00:00

..

java

Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"

2016-11-30 21:52:13 +00:00

jni

Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger

2016-11-22 17:19:45 -08:00

res

resolve merge conflicts of a578ae2 to stage-aosp-master

2016-12-01 00:00:55 +00:00

tests

Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1

2016-11-17 18:57:58 +00:00