OSDN Git Service

Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
authorSelim Cinek <cinek@google.com>
Thu, 14 Jul 2016 01:58:52 +0000 (01:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 01:58:52 +0000 (01:58 +0000)
commit46aeea5dc1508af059a11df5809d0b70d21fda04
treeef2c7b03c9ae575b2065ca7f4cb74c49f4fda204
parent35dc926772a76755879ba47580274b964bc5ba5e
parenta7ebd4f4bb1bacc0f31228e03b631ca6f879891c
Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
am: a7ebd4f4bb

Change-Id: Id3ffe5addb5e036eeda993d8dd6603b88c785804