OSDN Git Service

resolve merge conflicts of 0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp...
authorJakub Pawlowski <jpawlowski@google.com>
Wed, 9 Aug 2017 16:23:37 +0000 (16:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 16:23:37 +0000 (16:23 +0000)
commit94d4464c0525299f9ce585a0d23c449374f874c7
tree2d621a4a04147ab4f85e94412ed318c981495ecf
parent770056a2ee00832d08a0b2d5b3f3d0514cacc666
parentfe37b1e8f8ec9adcedf5b7be3340fb2be1e34a9d
resolve merge conflicts of 0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp-master am: ca61556a76
am: fe37b1e8f8

Change-Id: Idf45696c975e3c65d955e9a19c446bb471900536