OSDN Git Service

resolve merge conflicts of a71003d to nyc-mr2-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Wed, 7 Dec 2016 13:24:58 +0000 (05:24 -0800)
committerNick Kralevich <nnk@google.com>
Wed, 7 Dec 2016 13:25:04 +0000 (05:25 -0800)
commitbd7bd1be80f5baca04bb4e4594df1c84e6e0658d
tree8466d2aaa6073e40f248e09cc2c2d5fa41f8d876
parentfba95e105b0130f0d054fd007d6b26ac54073b6c
parenta71003da666b9d36f09137e8bae11d841705d0e5
resolve merge conflicts of a71003d to nyc-mr2-dev-plus-aosp

Test: Android compiles.
Change-Id: Ifa47225939dc6f59890b5c5fd1584547c09605a6