OSDN Git Service

Merge changes Ie762ce75,I611fd791
authorHugo Benichi <hugobenichi@google.com>
Thu, 11 May 2017 12:43:42 +0000 (12:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 12:43:42 +0000 (12:43 +0000)
commitcc9f695ba05bc6bfd82a246b585bddd0d0a2af8b
tree35a8bb42f578ec2fde489dea37cbb7f5a0db7c97
parent10085b3737d5b818d93661c22f5fc5ac74711ffe
parent21a57f263f1f84f3acc0e04661e720b5f7be48ff
Merge changes Ie762ce75,I611fd791
am: 21a57f263f

Change-Id: Ibb291720f6c257a8ead2c039f584f4b3ecc69be5