OSDN Git Service

Merge "Recursively remove preference from screen." into oc-dev
authorFan Zhang <zhfan@google.com>
Thu, 25 May 2017 03:25:43 +0000 (03:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 03:25:43 +0000 (03:25 +0000)
am: 7731b4244e

Change-Id: Ib3c637bcb4bbd6ded83f626b1b00dff32f9cb12c


Trivial merge