OSDN Git Service

resolve merge conflicts of 65cbaeb to nyc-dev-plus-aosp am: 8088eb27bd
authorSami Tolvanen <samitolvanen@google.com>
Tue, 7 Jun 2016 01:16:52 +0000 (01:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 01:16:52 +0000 (01:16 +0000)
commit50fd053ea4a9ce01baa3e08d608c5052ed06e447
treedfa5625fbf2f48ecaca8244e71d6ee5860650ff8
parent43004f9892b27d6031f2d608dffca3c766bb0af5
parent07c96a0f6d3948d98a3f9f92fdf5d3a21cedb5ca
resolve merge conflicts of 65cbaeb to nyc-dev-plus-aosp am: 8088eb27bd
am: 07c96a0f6d

* commit '07c96a0f6d3948d98a3f9f92fdf5d3a21cedb5ca':

Change-Id: I998cb611e09b0eb5bc45a327cbc12e42b98ad926