OSDN Git Service

Merge \\\\"DO NOT MERGE revert public api loadSafeLabel\\\\" into lmp-dev am: 521efcd...
authorChen Xu <fionaxu@google.com>
Fri, 1 Jul 2016 22:32:05 +0000 (22:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 22:32:05 +0000 (22:32 +0000)
commit67f8e822acd065dcbae9dce4109a70034fcf0314
treece98662c7347bf0c6526ace4e8aac5e65e189b7a
parentc7824b3de3057775cf11bbcd4d733793c67e2d56
parentcaabaab8bcb194ce38b0f008a8a2b885bc5b29c0
Merge \\\\"DO NOT MERGE revert public api loadSafeLabel\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9
am: caabaab8bc  -s ours

Change-Id: If1a5d01375b2a4e503ddf93bba5e009754889d44