tree c258b334a883051207f10cb3756a13cfa01a9214
parent ea44726e5a342d117039b368cdad0b564db66df1
parent e4d30432c584b2835759a996188f75bff6a39b99
author Mike Stroyan <stroyan@google.com> 1478821138 +0000
committer android-build-merger <android-build-merger@google.com> 1478821138 +0000

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

Change-Id: I9ab4a7e6d49ea93eb7d7b308fe38e913cf0d3f80