Daniel Nishi 47b07cc9c1 Merge changes from topic 'storage-o-strings' ...

* changes:
  Use total size and not free in Storage summary.
  Add new strings.

2017-03-17 22:03:48 +00:00

..

app

Use GLIF theme for screen lock confirmation

2017-03-15 13:26:54 -07:00

robotests

Merge changes from topic 'storage-o-strings'

2017-03-17 22:03:48 +00:00

unit

Remove ambiguous wildcard import of org.mockito.Matchers.*

2017-03-17 13:10:03 +00:00

Android.mk

Change build targets for settings tests

2016-01-21 12:32:15 +00:00