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:24 +0000 (16:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 16:28:24 +0000 (16:28 +0000)
commit82bd5246e70d3561fb4991a1a21bb0d884e3096a
tree77358089dfb749df53da2a509fce6b9f6dc778b1
parentc7c647bbf079259f73f8f5e899edce93ada397cc
parent6ec78a64583d74085a046a9bc8b265d230b4a520
Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
am: 6ec78a6458

Change-Id: Ie77c87f366c21acb05afcf5d03ddc6d75e9b950a