tree c258b334a883051207f10cb3756a13cfa01a9214
parent 9df80eb42c9e831a1e0b3be4f5346c2ff13b278c
parent 0ef67ba36163808a949135d08dcb9a18afc69d5b
author Mike Stroyan <stroyan@google.com> 1478732937 -0700
committer Mike Stroyan <stroyan@google.com> 1478732937 -0700

Merge remote-tracking branch 'aosp/upstream-android_layers' into 20161108-merge-android_layers_to_master