| commit | 5e16403f57fe551169a3755ad96c46faddc5a9fc | [log] [tgz] |
|---|---|---|
| author | Victoria Lease <violets@google.com> | Tue Oct 30 13:37:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 30 13:37:20 2012 -0700 |
| tree | c46792ae49565b4af9b7dfe4af28cc8d5c478d78 | |
| parent | 34967a1c26ca26d3fc3a56de6296bda01e7eeb43 [diff] | |
| parent | e7f1e7fa3a691099b28a51e7825f6e0810b767da [diff] |
am e7f1e7fa: (-s ours) am 517303e0: am ac14efce: Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev * commit 'e7f1e7fa3a691099b28a51e7825f6e0810b767da': DO NOT MERGE suggest LocationRequest rather than Criteria