tree 2dd5697d1bd07f681be1ffd5010bea2f0d033444
parent d5a3c01660aeba036b7c09c9f6c7933d93e7b61e
parent e4f35b111e36e00f73028ccdba0822e1690149ce
author Tom Cherry <tomcherry@google.com> 1494277247 +0000
committer android-build-merger <android-build-merger@google.com> 1494277247 +0000

Merge "Revert "Make /data/data a symlink to /data/user/0"" am: 823816ee9f am: 20a74298a5
am: e4f35b111e

Change-Id: I9fdb4b5d8e6b1dcf89b853a737f389553cc1a1df