tree 3a71c11552eac651f07b7a22440829150c3f5152
parent 0f741391c393d06322bb88ed729f7029d33d641f
parent 59fc768893aa06a4c863f959d03d65033735a68d
author Chen Xu <fionaxu@google.com> 1467847791 +0000
committer android-build-merger <android-build-merger@google.com> 1467847791 +0000

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

Change-Id: I1eeb704e6b0a29e3574e969649ba72bbb5d9a9c2