| commit | 5ccff048496b9058f3069b3e9059ad74671e2fea | [log] [tgz] |
|---|---|---|
| author | Tony Mantler <nicoya@google.com> | Mon Mar 23 21:01:04 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 23 21:01:04 2015 +0000 |
| tree | 5e7c942708074b40b0089f97fda74010f3fff579 | |
| parent | ff3558eaeb66572c2732bf76335997e1338f363f [diff] | |
| parent | 84765eaea7da18d0576db557959129e9d0db8e8c [diff] |
Merge "Read both android: and local XML values for prefs"