OSDN Git Service

DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu. am: d9b3709fc1
authorYouhan Wang <youhanw@google.com>
Wed, 21 Dec 2016 00:42:10 +0000 (00:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Dec 2016 00:42:10 +0000 (00:42 +0000)
am: 70b47859fa  -s ours

Change-Id: I95e1db20b25b33a7bc29281f7ecb46524eb15116


Trivial merge