OSDN Git Service

Merge changes Iafd12677,I40595d15 am: 0599c5976a
authorRichard Uhler <ruhler@google.com>
Tue, 12 Jul 2016 18:51:49 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 18:51:49 +0000 (18:51 +0000)
commit6439d4b52809eec77fc580bbb73fc5e2d77cef91
treea64cf2f4d41c397f0a9b6f83b74b6c5a4150290c
parentfc99784c16a82ce0f3eaa71f979be372ca395420
parent7292a51227813872f71ed9e4804298c53c80e76e
Merge changes Iafd12677,I40595d15 am: 0599c5976a
am: 7292a51227

Change-Id: I55c49f897c6f5a288af11683e67fdf2fb53b5e84