tree 4badd17aaca62b633699086348d38085add98e53
parent b3b43923bd4340108b5f166ebc5dd6ff3380cfae
parent 0e618b2c641020f5b46bf29fbf01825b17e99f0d
author Bill Yi <byi@google.com> 1481067983 +0000
committer android-build-merger <android-build-merger@google.com> 1481067983 +0000

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 0e618b2c64

Change-Id: I3a9a4bdd96ee39d7e7ae4179eef8d8cc683f38d3