OSDN Git Service

Merge changes I40f055df,I562713df
authorJeremy Joslin <jjoslin@google.com>
Thu, 22 Dec 2016 19:02:45 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 19:02:45 +0000 (19:02 +0000)
commit8eff13b521f6ba3bc8f0c3f095fa1565a3c819f7
tree8fd5c0b8879f1c15e4464034fe4f3c9046538531
parentd79019a61617b1f677a8b4ceb0b5369d2d73aeee
parent4a04c07df403376f325f168bbc1031307193a325
Merge changes I40f055df,I562713df
am: 4a04c07df4

Change-Id: Ie951518a0a472691d1cd8b90a025e3a67b1acd53