OSDN Git Service

Merge changes Idcbbc7eb,I3dc48800
authorJakub Pawlowski <jpawlowski@google.com>
Thu, 16 Feb 2017 20:15:22 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 20:15:22 +0000 (20:15 +0000)
am: 6f04f03f44

Change-Id: I690e029727e74f6c948ff29be79f2c90645d5a9c


Trivial merge