resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp am: ed852bf557
authorKalle Raita <kraita@google.com>
Tue, 20 Dec 2016 22:20:20 +0000 (22:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 22:20:20 +0000 (22:20 +0000)
commit82e17969c1e165843b61953863fe3765c6c2fb3f
treeb4c34f861284c67e866ea1ec863c733b192c6aed
parent296c5d3d4863e22385d7c8a817b7b5a7b0a5be1f
parent900673646e43c2ebf7bed23b35225c1c39759483
resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp am: ed852bf557
am: 900673646e

Change-Id: Ie357de73c562ce54ef3b8192c156822dc45f78c7