OSDN Git Service

resolve merge conflicts of 6b142ed to nyc-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Fri, 24 Jun 2016 21:56:38 +0000 (21:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 21:56:38 +0000 (21:56 +0000)
commit6989dc48570292c8d4ae2db097f0377e35ccef01
treebe5534d1fa3ab4b4ee026cc9b6f5530d742c151b
parent4d186c8202c2e00081e557563bd9a6cf6cfa4e48
parentfa0ca05540feffe23c26dcd345202b6243f9cc44
resolve merge conflicts of 6b142ed to nyc-dev-plus-aosp
am: fa0ca05540

Change-Id: I3d18778d8263e6409db0e72697719e7339ac485c