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