tree 8c5fd103ad9cb132c552e2af85819c64f67b3634
parent 6d5e443d5f090be54f0f1623171bf83102c0e688
parent 7a8860406c015bbc63f382efed9372044eb0cb74
author Bill Yi <byi@google.com> 1481068574 +0000
committer android-build-merger <android-build-merger@google.com> 1481068574 +0000

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 47d4c9ba5a am: 662bce0572 am: 09bac87fe5
am: 7a8860406c

Change-Id: Ifb7f9c4e39bcc959389e408c65680d11216ab496