OSDN Git Service

Merge changes I868417f4,I57ac3667 am: 8336b64442
authorDimitry Ivanov <dimitry@google.com>
Tue, 9 Aug 2016 00:40:37 +0000 (00:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 00:40:37 +0000 (00:40 +0000)
commit5f5c8fd592f5e274ca6aaa00770f4e28e18f3c41
treeeff0f63e5cdd7febfeb731eb1f4f87b5fcc54c8c
parentcbf57527f61b06bbd33d9458d09b773d952b8ef2
parentf24a92d7b12617ccc4b2efdd3451ea9e3de6a138
Merge changes I868417f4,I57ac3667 am: 8336b64442
am: f24a92d7b1

Change-Id: I8368368829f0480b3cdfcb9b4bb48231266fa4d4