tree add5ec7cbd1554be469648f1cdd123b361f39de6
parent 76d95bae6e9da4ed9d5554fb06bbc471932520ec
parent 6ae5c7c7d5d9ccf0975e148b5364971a1fe24aa4
author Bill Yi <byi@google.com> 1481068194 +0000
committer android-build-merger <android-build-merger@google.com> 1481068194 +0000

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: a15c4b3d40 am: 5df8d25038
am: 6ae5c7c7d5

Change-Id: If2f8d70a109c58757abdd870b4b67595863e9251