Nadia Benbernou f4810f5506 Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581" into nyc-dev

2016-05-02 14:15:46 +00:00

..

java

Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581" into nyc-dev

2016-05-02 14:15:46 +00:00

jni

Fix build break due to 32/64 bit compilation.

2016-04-29 13:11:33 -07:00

res

Merge "Add missing theme entries to Holo.Light" into nyc-dev

2016-05-02 02:55:13 +00:00

tests

Merge "Ensure local settings caches are not stale" into nyc-dev

2016-04-26 18:36:28 +00:00