OSDN Git Service

Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
authorDaniel Yu <dsyu@google.com>
Tue, 28 Jun 2016 16:28:34 +0000 (16:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 16:28:34 +0000 (16:28 +0000)
commita2ffb20c0680613d61d6822bc717a83c4ac00897
treee37fcf5b15bd6d05eab425951d217aa3e1175ea5
parent0d27e2d62489ecc13e021c99c7e9a8b657ecd460
parent6ec78a64583d74085a046a9bc8b265d230b4a520
Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
am: 6ec78a6458

Change-Id: I8c631533ad43598475938bc1e3f9f0f171511c0a