OSDN Git Service

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 23:58:43 +0000 (23:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 23:58:43 +0000 (23:58 +0000)
commit2b8694c33d5ac3ce8c59fcf13e9ddba930933c37
treeaad97357bf05cefd50aad2e1eb834c7f13fdaf09
parent3adf585961a03f26aed9c654ec899396341ae0f5
parent4f8be72b18be5f769d886bcc6d89add3b59072c1
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df
am: 4f8be72b18  -s ours

Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76