refs/heads/oreo-dr1-release - platform/sdk

commit: 66f0813aa7b41a5431082dda5ecda4c3abdf5a12
[log]
author: Dan Willemsen <[email protected]>
Fri Aug 12 03:21:45 2016 +0000
committer: android-build-merger <[email protected]>
Fri Aug 12 03:21:45 2016 +0000
tree: b2d02749a101456dec8a0738c28e1b16dfb0bff9
parent: aa24216d07eb84a8beb2a8c9d84db451afa23f5a [diff]
parent: 1da8730be2203d266be81f9a6e0446f9f8da4717 [diff]

Merge changes Ifc818a69,I433b33d0 am: be20684665 am: 576f858aaa am: e17dd6e292
am: 1da8730be2

Change-Id: I8b569d223dcc896c2fdce51e92d1d4096e9d413e

tree: b2d02749a101456dec8a0738c28e1b16dfb0bff9