OSDN Git Service

resolve merge conflicts of 4ad7784 to stage-aosp-master
authorPaul Crowley <paulcrowley@google.com>
Wed, 28 Jun 2017 22:45:50 +0000 (22:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Jun 2017 22:45:50 +0000 (22:45 +0000)
commit8e6f6a5cebf023905b37b0fc80d3ceec262a0d91
tree5bfe06bb56a6f4ae5647ee64032b28df47addb0d
parentdfd04923541de579e99ac8dacc678abb3a3e3f33
parentddb542f5745d37a8d5b72732f67a4e60b895254b
resolve merge conflicts of 4ad7784 to stage-aosp-master
am: ddb542f574

Change-Id: Iedef223a14b8a0c8dc558440b429a33d6b23f948