tree c258b334a883051207f10cb3756a13cfa01a9214
parent 6771e226f706f4aeba48d1136e008cd348699c96
parent 9a4ddc16e893b24b7e48adbff2a2de57d6e73641
author Mike Stroyan <stroyan@google.com> 1478819856 +0000
committer android-build-merger <android-build-merger@google.com> 1478819856 +0000

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

Change-Id: I32976cb9dd7c9268b426156bf408046a226125ce