OSDN Git Service

Merge "Remove summary template in sleep timeout setting." into oc-dev
authorFan Zhang <zhfan@google.com>
Mon, 8 May 2017 19:08:20 +0000 (19:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 May 2017 19:08:20 +0000 (19:08 +0000)
am: 014ff46fa6

Change-Id: I9f9e924be57552eebfe5d8bff5463182463f6845


Trivial merge