tree c258b334a883051207f10cb3756a13cfa01a9214
parent 6771e226f706f4aeba48d1136e008cd348699c96
parent 11fd7322a04dad1efc40af23fd5b1b8c53ac63eb
author Mike Stroyan <stroyan@google.com> 1478820637 +0000
committer android-build-merger <android-build-merger@google.com> 1478820637 +0000

Merge remote-tracking branch 'aosp/upstream-android_layers' into 20161108-merge-android_layers_to_master am: 9a4ddc16e8 am: 612b978e93
am: 11fd7322a0

Change-Id: I685d4cf02d51bd8cc625554ea870d592dda40f6e