tree 7691c59f08159384908a2e20ff99a2fe8b31499b
parent 9879d17384ac3e3d4046b7f79d21aee3a1183284
author Tom Taylor <tomtaylor@google.com> 1481070374 -0800
committer android-merger <android-merger@vpba3.mtv.corp.google.com> 1482183116 -0800

resolve merge conflicts of eafd58a to nyc-dev

Change-Id: I58151ca0c248dd4b84c78c8e7ca73d5a80bbd962
(cherry picked from commit a43c5c5f18d966355a63db194c931e02267a2695)