OSDN Git Service

DO NOT MERGE ANYWHERE Add new power hints for launch activity am: a2aa3f358f -s...
authorWei Wang <wvw@google.com>
Mon, 18 Jul 2016 23:45:23 +0000 (23:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Jul 2016 23:45:23 +0000 (23:45 +0000)
am: 45d1d74210  -s ours

Change-Id: I4689365f8c48e94160bc6c74ab1ff86a6f81e8c4


Trivial merge