tree 093ca468b973a3281fcc7b3d5ce924c8ab04586c
parent 6c35cf2434ca373196b16620455f8f234b63d594
parent 9a825b0fd50537f49057f7e1c9f91fc071c584c4
author fionaxu <fionaxu@google.com> 1465341790 +0000
committer android-build-merger <android-build-merger@google.com> 1465341790 +0000

Backport loadSafeLabel changes am: be2865a60a am: 4c50846519
am: 9a825b0fd5

Change-Id: Ie3042058420fbd3018ae238dab4129de58ec69c8