OSDN Git Service

Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev
authorBill Yi <byi@google.com>
Fri, 18 May 2018 00:09:03 +0000 (17:09 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 May 2018 00:09:03 +0000 (17:09 -0700)
commit4d58eb3bc17d488a187007b8dd105de9d7dce949
tree2df3caf8ad0cbf3368c73baf7cb130e95a3d3a3e
parentc22431c753de5fd028ee1a1898f38f72f9c22ce5
parentabf0ff542a57b19bd83182249475b9bcd3fca2bc
Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev
am: abf0ff542a

Change-Id: Id3b645350fefaee4071d56d6e4bd368fa535350e