| commit | 970d00347dfc8e66ba11bb5909905d5c63f24121 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Dec 17 23:03:01 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 17 23:03:01 2012 -0800 |
| tree | db7296db2019b7b31e17ace2d9b3a35fe20fe59b | |
| parent | ecccbbc4ac84379b4b4f40fc9c958af886d5e4e5 [diff] | |
| parent | 23e89348ff00b9bfffd08f58e4cbeced50085869 [diff] |
am 23e89348: (-s ours) am f63c7565: (-s ours) am 90f51589: am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev * commit '23e89348ff00b9bfffd08f58e4cbeced50085869':