OSDN Git Service

resolve merge conflicts of 48d4fe1 to nyc-mr1-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Wed, 7 Dec 2016 13:20:15 +0000 (05:20 -0800)
committerNick Kralevich <nnk@google.com>
Wed, 7 Dec 2016 13:20:25 +0000 (05:20 -0800)
commitee9c24d6e09bdee02af8adba3624cbea68b2929a
tree8466d2aaa6073e40f248e09cc2c2d5fa41f8d876
parent756329a3047c82fd04d6b5789c5e3512cf3bca72
parent48d4fe138ee8ea8a9518144c42b18fb138aac4ec
resolve merge conflicts of 48d4fe1 to nyc-mr1-dev-plus-aosp

Test: Android compiles.
Change-Id: Ibee3f2dae93e9d1bc7171588c1aa41b53e177687