tree 8acc10965eb125a6286beacf3ae829aba67d852a
parent 885cdce4cfcd2c6adb5dca4a27d9c3f3d12db914
parent 006f754345e1d5b83bd9c53e4b5df263b3ee353b
author Hui Yu <huiyu@google.com> 1550090491 -0800
committer android-build-merger <android-build-merger@google.com> 1550090491 -0800

[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master"" am: 539c545dc7 -s ours
am: 006f754345 -s ours
am skip reason: subject contains skip directive

Change-Id: I4bfc5f1825b55ae6a7fa69b1b3b5a56509f15ee5