tree 68eedbffa81014edcbecfd0d0819a2dcb16d8869
parent f82ca1f3e9f6c24060e7e5d9fed3c6940ef79c12
parent d2e2288fe30335f022557fc2881e2be878bd92cc
author fionaxu <fionaxu@google.com> 1467847444 +0000
committer android-build-merger <android-build-merger@google.com> 1467847444 +0000

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

Change-Id: If7bb704d5d6ae942b7ceac3e9f22acf4cf3a7b4b