| commit | 0f741391c393d06322bb88ed729f7029d33d641f | [log] [tgz] |
|---|---|---|
| author | Chen Xu <fionaxu@google.com> | Fri Jul 01 22:45:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 22:45:46 2016 +0000 |
| tree | 48dc0c065a088cb7cc37d19f1dd9d3d84697a517 | |
| parent | 2a44859c214d083cef72ab7c3d6b99bc42a101b3 [diff] | |
| parent | f82ca1f3e9f6c24060e7e5d9fed3c6940ef79c12 [diff] |
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 Change-Id: Ib714c74aa3bede2bea496204b7d1cb7ff2380dca