Merge \"hide PII from log\" into nyc-mr1-dev
authorfionaxu <fionaxu@google.com>
Wed, 6 Jul 2016 23:22:26 +0000 (23:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jul 2016 23:22:26 +0000 (23:22 +0000)
commit1239d9f40450e90658580bd3632656602ad45a2d
treeb2775afdfa2e0330f80b1289569c81b93d62b188
parentd90fe9036747fa1f12bb6c32782feefc3ca5d5a7
parente4344cd61ef3b282c35864eb10e681f1f3caa1da
Merge \"hide PII from log\" into nyc-mr1-dev
am: e4344cd61e

Change-Id: If980329bf58064f6c7b689bb995d7f648c69ef1a