OSDN Git Service

resolve merge conflicts of c4ae782 to nyc-dev-plus-aosp
authorElliot Waite <elliotwaite@google.com>
Mon, 25 Jul 2016 22:39:04 +0000 (22:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 22:39:04 +0000 (22:39 +0000)
commitb8500c9d6bc115282fa359c6820ea785bacecd49
tree034d1f017c22cf59daf27ff70d52656fffe1c346
parent8d79dc9350150a84e13ca0caf4456e32279f5ba9
parent66641f8ec526bfffe3193795cdcf88a16c7b9f5d
resolve merge conflicts of c4ae782 to nyc-dev-plus-aosp
am: 66641f8ec5

Change-Id: Ie46a3e22905ba61eedb1c5b26a838d77c680d829