commit | 7b0e2827153752ae51c3ae80746e42ee185e7358 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Tue Feb 11 21:25:45 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 11 21:25:46 2014 +0000 |
tree | e29c16cfabb74e52f927fb85a86189f61efa2b59 | |
parent | 2e1ff903b816b3acbb70663a728713b26397eb23 [diff] | |
parent | c6809bb6853c6f055905cbbbf873bbe4066c5d21 [diff] |
Merge "First <provider> always wins."