tree fe75dbb7ed0c1083eabb1ad0f83d091a80807d61
parent 2ef5e899a8cfee7ce41e9e219b271fb250ba9cf5
parent b843fca514bf16b3ba2cf2ddfec626e280dd0713
author Glen Kuhne <kuh@google.com> 1470853330 -0700
committer Glen Kuhne <kuh@google.com> 1470853601 -0700

resolve merge conflicts of b843fca to nyc-dev

Change-Id: I9dd10e35d901404b6d77d9ca0f99dbc8c2294b2f