Fan Zhang 8b422ba448 Merge "Remove summary template in sleep timeout setting." into oc-dev am: 014ff46fa6 ...

am: f7ba1e7209

Change-Id: I867a5237475be372bcc183b038c9539a3c4a8087

2017-05-08 19:14:59 +00:00

..

android

Use the new OemLockService to get OEM lock state.

2017-04-19 21:33:37 +01:00

com/android

Merge "Remove summary template in sleep timeout setting." into oc-dev am: 014ff46fa6

2017-05-08 19:14:59 +00:00