Salvador Martinez fec50f4248 Merge "Shorten main settings battery string" into oc-mr1-dev am: 4e963f8f91 ...

am: 6db99201aa

Change-Id: I82bf5cfe72cfd8ec774c6c7d21c17bd946163903

2017-08-01 20:15:41 +00:00

..

android

Merge "Default setup wizard to use PIN"

2017-05-18 08:43:24 +00:00

com/android

Merge "Shorten main settings battery string" into oc-mr1-dev am: 4e963f8f91

2017-08-01 20:15:41 +00:00