| commit | 155efcf6962c8cb63c65a0e03950e2d521fc73e6 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Thu Dec 20 14:00:23 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 20 14:00:23 2012 -0800 |
| tree | 1653ee093e04faa67509e8de2bd3129251b29087 | |
| parent | fa806be93ecda26e7eaf2df56249697afb131cf1 [diff] | |
| parent | 2af6d0348850a796f27879c9972b8751415f27d1 [diff] |
am 2af6d034: am cc0eae7f: am 931dcd41: (-s ours) am 11852804: am 96b24f58: (-s ours) Merge "DO NOT MERGE Relax LocationVerifier assertions." into jb-dev * commit '2af6d0348850a796f27879c9972b8751415f27d1': DO NOT MERGE Relax LocationVerifier assertions.