Jerry Zhang 4c4666c5ef Merge commit '54f33d9af22e62629798555a3cde4e784bd8ba54' into manual_merge_54f33d9 ...

Change-Id: Icfd9bc3eff034d33e733dbb8386949c9ec345e58

2016-11-17 10:48:26 -08:00

..

java

Merge commit '54f33d9af22e62629798555a3cde4e784bd8ba54' into manual_merge_54f33d9

2016-11-17 10:48:26 -08:00

jni

Merge "Add wordSpacing parameter to Paint"

2016-11-17 08:00:01 +00:00

res

Update colorPrimary in watch am: 9072dcd82c am: 78fef4c065

2016-11-16 21:38:16 +00:00

tests

Rename MountService to StorageManagerService.

2016-11-15 12:43:37 -08:00