tree 060f83ca60a6d9a907c38ae0b56910597c71e085
parent 005394cd017690c67a5691317d5d917ee57065e1
parent 0f741391c393d06322bb88ed729f7029d33d641f
author fionaxu <fionaxu@google.com> 1467413745 +0000
committer android-build-merger <android-build-merger@google.com> 1467413745 +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

Change-Id: I9748b9d7b065a6d2bbd9c2a3061409c58b53d261