tree af1aad54ffa5db439fc13f1e4dc49f1f57e3bfb2
parent 0a6ca96902c86d3c5ffd18347db7ee3a240cc6c1
parent b3da44d9a1560c8b3092ef66081db135d1ff4c4f
author Calin Juravle <calin@google.com> 1518730227 +0000
committer android-build-merger <android-build-merger@google.com> 1518730227 +0000

Merge changes from topic "cp_calin_framework_2017" am: b98102b4dc
am: b3da44d9a1

Change-Id: Ibd848f6803d63da46ae1461b469422c5a6431980