OSDN Git Service

Merge "Support multi-window on low-memory watches." into oc-dev
authorErik Wolsheimer <ewol@google.com>
Thu, 1 Jun 2017 07:29:13 +0000 (07:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Jun 2017 07:29:13 +0000 (07:29 +0000)
am: c6372cceb1

Change-Id: I77921a68a231dd3504f06a726af4f1b7903ac44d


Trivial merge