OSDN Git Service

Merge "Back-port ag/2491664" into lmp-dev
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 18:26:18 +0000 (18:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 18:26:18 +0000 (18:26 +0000)
commitcbbdc18c7bf28435a7658e0ddfd081a715f11a6e
tree0161bf7a64a38fc1522348f7cb7711899b8918cb
parent1d21738bd67d0a7980193fe1ae6e57a72f0febe9
parent41492a1e2cdfd319faeac705e13d42954709808f
Merge "Back-port ag/2491664" into lmp-dev
am: 41492a1e2c

Change-Id: I4e099fb9a737936f12357670635232a7913e3cfd