OSDN Git Service

Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 18:36:26 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 18:36:26 +0000 (18:36 +0000)
commitc84dc8feb388d5cb8748946118df28bf5b6c0327
tree4fd60f47f6eed3297fe619114219356c1e7ff056
parent41507397913c129d0b316d90592d6fa455be38c4
parentcbbdc18c7bf28435a7658e0ddfd081a715f11a6e
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b

Change-Id: I3cb41508ce487f1d4a21517c86ef57f9cc041705