OSDN Git Service

resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357...
authorTony Mak <tonymak@google.com>
Mon, 11 Sep 2017 15:05:29 +0000 (15:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 15:05:29 +0000 (15:05 +0000)
commitc6d39d47c5a00c87efbe7e8b3173c492f7e36892
tree2404f0728c59b881e98a8ad877971caeb6faab85
parent6ccf40be0b53c4d110002c2bfa1f39fa530b9b6d
parent72bbe1d6315cd471af058651149636022732f29b
resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3 am: 4453c3cda2 am: 79a32d0a8a  -s ours am: 9c358ccbe2  -s ours
am: 72bbe1d631  -s ours

Change-Id: I90da7d1636e4692adfcba36b702d8262b3fe3b4e