tree 5e7c942708074b40b0089f97fda74010f3fff579
parent ff3558eaeb66572c2732bf76335997e1338f363f
parent 84765eaea7da18d0576db557959129e9d0db8e8c
author Tony Mantler <nicoya@google.com> 1427144464 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1427144464 +0000

Merge "Read both android: and local XML values for prefs"