tree 54a172171819af3be60a6f1ae5712938d57a2478
parent 7628ae28d53adb0f1ee9ec1118bd3aa67c552751
parent 8709d0fce882fdab2c8cf0ebba922ed803889d02
author Annie Chin <afchin@google.com> 1468454022 +0000
committer android-build-merger <android-build-merger@google.com> 1468454022 +0000

Merge \"Set mContext scope to protected.\" into nyc-mr1-dev
am: 8709d0fce8

Change-Id: I23720c8a6f577da910a45bbbc4373f1ad9256ce8