OSDN Git Service

Resolve merge conflicts of ffb4eb1 to nyc-dev
authorJoe Fernandez <joefernandez@google.com>
Tue, 2 Aug 2016 21:40:08 +0000 (21:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 21:40:08 +0000 (21:40 +0000)
commitaf74842e3a5d34be67f2ec6df8a6931476d41458
tree7010ab4388bf3f395b6955dd5cb78fcad0118070
parent828d4ff61d58c586c3b1f4ce9e0abb55505076df
parenta5abfee3a5ac827f606e7253f03674c1a6ee1277
Resolve merge conflicts of ffb4eb1 to nyc-dev
am: a5abfee3a5

Change-Id: I7c4265a691636c1de8b47688cfaa15e57907caee