OSDN Git Service

DO NOT MERGE: Cross profile candidate should be considered am: ff11122ddc
authorTony Mak <tonymak@google.com>
Tue, 20 Dec 2016 17:02:16 +0000 (17:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 17:02:16 +0000 (17:02 +0000)
am: 83dcc26065  -s ours

Change-Id: I57fe241a3a1aa961eee8b04799600cbfc7e619e0


Trivial merge