tree 401abf392b2073bf982e85c616cfb4f787254a45
parent faab4b05e8acfd6432f0aa779e3868c37184a301
parent 5bfb914572d1cc678fe24e514ff8f014b4285c4c
author Adam Seaton <aseaton@google.com> 1495572149 +0000
committer android-build-merger <android-build-merger@google.com> 1495572149 +0000

Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949  -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085 am: 73452ebcd6 am: a09b52458b
am: 5bfb914572

Change-Id: I2b06ffd59ae27aafc4ee0c74fe0fac8ebd5d00a4