Merge "resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70...
authorNicolas Boichat <drinkcat@google.com>
Tue, 20 Dec 2016 22:34:42 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 22:34:42 +0000 (22:34 +0000)
commit4f3d8a3a2c8e14c07314de04ebc3c4d31d7d1cc5
treeb4c34f861284c67e866ea1ec863c733b192c6aed
parente5b456769bbe12943babd641383c57d82ab4b9d3
parenta048f0632d1e38a435026883319882964cb6b467
Merge "resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am: 52bab3789f" into nyc-mr2-dev-plus-aosp
am: a048f0632d

Change-Id: I8ec1b04a550e3f8329d29556aac89612ea03088e