OSDN Git Service

Merge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am: 521efcd1e...
authorfionaxu <fionaxu@google.com>
Fri, 1 Jul 2016 22:16:10 +0000 (22:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 22:16:10 +0000 (22:16 +0000)
commitcaabaab8bcb194ce38b0f008a8a2b885bc5b29c0
treec994a85d2a2cdd31e844d57b6e95e7e4a2395d26
parent1e1974705bdda85b6777f4252bc079af336a29a8
parent0828455ca9751e2ec7efcea78f73871a0bcd4d89
Merge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999
am: 0828455ca9

Change-Id: Ie1d5e38af7c3c49eb69f61e379096b17dd004961