tree 5e474c0b4159c6e0a283c0c86f02023db8abcaec
parent 67f8e822acd065dcbae9dce4109a70034fcf0314
parent 99973d9852eb1a6628d67cbbbe740ee3daee3798
author Chen Xu <fionaxu@google.com> 1467847013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467847015 +0000

Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev