Jeff Sharkey 0463cad783 Maybe make strings happy? ...

Bug: 21805255
Change-Id: I2e299a83b449aadc8e9a523fc4bbbf6f843f121d

2015-06-14 21:18:10 -07:00

..

java

Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev

2015-06-14 20:01:02 +00:00

jni

Merge "Set scaling mode for legacy device surfaces." into mnc-dev

2015-06-11 22:15:58 +00:00

res

Maybe make strings happy?

2015-06-14 21:18:10 -07:00

tests

Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev

2015-06-12 19:28:54 +00:00