OSDN Git Service

resolve merge conflicts of de591df to nyc-mr2-dev-plus-aosp
authorNaveen Kalla <mrnaveen@google.com>
Fri, 28 Oct 2016 23:16:34 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Oct 2016 23:16:34 +0000 (23:16 +0000)
commitc362b894a87876c37131b9a7beadf9649d25ff5b
tree4bab403a86e7a6970e8c55a325157d79a8d07b74
parent633f08bc7bc61bf478a1c4077388598be2d673da
parent27de3fc0a14e4adc73f6bb5e68f90a59d0e68110
resolve merge conflicts of de591df to nyc-mr2-dev-plus-aosp
am: 27de3fc0a1  -s ours

Change-Id: I6184d22117a81ba5a7b0a8b18108eb9f178d08f9