OSDN Git Service

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 18:41:22 +0000 (18:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 18:41:22 +0000 (18:41 +0000)
commit37cf6265dbc0fe3e3694c58f82ce077c150c2b35
tree7896e6bc932e53806e09326e16d03ec9600f6322
parentccbac7e9e0d7e5d238da5101821fa9d030dac4e5
parent954deb1c6e39a6daf0aa4cbd7e778f63bc7657ae
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours
am: 954deb1c6e

Change-Id: I929c9dfa84b25fdbeadfedf0e0e9ecd914a74483