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:34 +0000 (15:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 15:05:34 +0000 (15:05 +0000)
commit77a3aed507131cda562a792d5e63f4f6d57f7723
tree52ac54e116892ea8257693ef3070a25e2b0595eb
parentf04b643ca8d1a11075dc48a26dd388e625f7add0
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: I85f10646a50af78fdeb8f80411350ecaec06ac40