OSDN Git Service

DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev
authorHugo Benichi <hugobenichi@google.com>
Mon, 14 Nov 2016 12:55:35 +0000 (12:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 12:55:35 +0000 (12:55 +0000)
commitbdf4d8a93cac49fb57065e0841cd184573dc7302
tree549a949802ad31a149222a7e0345d6664ab83138
parenta8a116b00180f4fe1ac7f56a904d7acd380c78ab
parent476da32d865f942cc470405ca84fadecf507ce9b
DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev
am: 476da32d86  -s ours

Change-Id: Ic4ff5e0c392488315659bef421535d43ac115e6f