OSDN Git Service

resolve merge conflicts of 8a094116b to stage-aosp-master
authorIan Elliott <ianelliott@google.com>
Tue, 18 Jul 2017 20:03:22 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 20:03:22 +0000 (20:03 +0000)
commitf8187f4e12abab363f88e0edcd21189f705148c0
treea450cea67ace1f69c2b84eb511da213ec193ffd0
parent5e1532a8eab10f73da157d047c9d4c03e1702e9e
parentbb7e1b68e6ce2ec44a716080bcf42bed87c8a90a
resolve merge conflicts of 8a094116b to stage-aosp-master
am: bb7e1b68e6

Change-Id: I453a7aaf28c20634337ac70ea6586d5a10d4736c