tree 16cbc42364994cee6f0479f575e906f7dcad4755
parent 9c29690314577c966c69c481547d3c376abb257f
parent 63fd9cc1fc6e6b0ceb78950d96f905fdd3edee32
author Bill Yi <byi@google.com> 1508876670 +0000
committer android-build-merger <android-build-merger@google.com> 1508876670 +0000

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 63fd9cc1fc

Change-Id: I800cb64d4413f38804f94db48340c2553b893ece