tree 4da70ca7984b47189beaf5388233bc496aba649a
parent 4000bdb3ea57fcd29eb81082969f92fa6f4f0b73
parent 69a071e55cd3356a61ab82e7aa53003fc13e444c
author fionaxu <fionaxu@google.com> 1467848160 +0000
committer android-build-merger <android-build-merger@google.com> 1467848160 +0000

Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893
am: 69a071e55c

Change-Id: If59d61dfdc00f740ffcf8fbe5233b191eb03a797