| commit | 28358cf9e75b2fbb4e5f3c70491ca65a21a7d111 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Aug 13 10:26:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 13 10:26:19 2012 -0700 |
| tree | e183d7d1e9ec8fb8477e45ab4b02a6013785026d | |
| parent | 732eb2746fbdf2468a848b4a01482bbd23a39a60 [diff] | |
| parent | a0347971dec3dc34c6ccebad5170ced255fdf35f [diff] |
am a0347971: am 605103fb: resolved conflicts for merge of 4dcd52ab to jb-mr1-dev * commit 'a0347971dec3dc34c6ccebad5170ced255fdf35f': Add support for reloading policy from /data/system.