OSDN Git Service

resolve merge conflicts of 012144f to nyc-dev am: bb9a8d8eb8 am: b73e902c7d
authorDaniel Micay <danielmicay@gmail.com>
Fri, 24 Jun 2016 03:47:34 +0000 (03:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 03:47:34 +0000 (03:47 +0000)
commitc9c70658b269ee73aeabc63bce97a2b3c928a343
tree9b64a7d6982a58ea711360f5116ea2a3dfb10511
parent091fa1edc91a45413650c7243f16d2aa82e1f61f
parent6fb6aa51a47ab0cb8bcbc3ab21ba68742229b2a5
resolve merge conflicts of 012144f to nyc-dev am: bb9a8d8eb8 am: b73e902c7d
am: 6fb6aa51a4

Change-Id: Idf628306cde9e0149db11c732f138289f180eea9