tree 845d5cf30a037a7e3c83e66ef774a0cf4c7eef35
parent 75d2d4e1d27ca8ccf0fd7dc4456b0a3dcf509dd2
parent 5a8be7ee6337367a1dcf11bdad865e7917519e46
author Bill Yi <byi@google.com> 1481068645 +0000
committer android-build-merger <android-build-merger@google.com> 1481068645 +0000

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: ed9d1ca52d am: b80ef47305 am: 16a584a67a
am: 5a8be7ee63

Change-Id: I7b17681c5381aaa00a5f6e38c6f6d186324b41d1