OSDN Git Service

Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev
authorWale Ogunwale <ogunwale@google.com>
Sat, 26 May 2018 02:43:48 +0000 (19:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 26 May 2018 02:43:48 +0000 (19:43 -0700)
am: 9d19487b1c

Change-Id: Ie430137f84f8b6a8d702e4ea5070ded4711da4a8


Trivial merge