tree 1ee8f019f702f86e6038c979af7300befb9db922
parent 1f226374440c9725d8ced9da634a02a3dd33be92
parent 1d5fbe43ab4cfc491ea7cee1c87a8c112ae7250d
author fionaxu <fionaxu@google.com> 1467414530 +0000
committer android-build-merger <android-build-merger@google.com> 1467414530 +0000

Merge \\\\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc  -s ours am: 67f8e822ac am: f82ca1f3e9 am: 0f741391c3 am: 4000bdb3ea  -s ours
am: 1d5fbe43ab

Change-Id: Id1224508ffee2c49243c958159bea70c14d55b91