tree aad97357bf05cefd50aad2e1eb834c7f13fdaf09
parent 3adf585961a03f26aed9c654ec899396341ae0f5
parent 4f8be72b18be5f769d886bcc6d89add3b59072c1
author Phil Weaver <pweaver@google.com> 1500422323 +0000
committer android-build-merger <android-build-merger@google.com> 1500422323 +0000

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df
am: 4f8be72b18  -s ours

Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76