tree 1964e809d747522729e77e60fbf91d9718ac4b54
parent 106f69c8a66428a1e9294691908ae47f10841405
parent 4000bdb3ea57fcd29eb81082969f92fa6f4f0b73
author Chen Xu <fionaxu@google.com> 1467414131 +0000
committer android-build-merger <android-build-merger@google.com> 1467414131 +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

Change-Id: I7a010f957438467d2edfb10a28a364527dac492e