| commit | 640517565c487dce9683e80795fc6a5df8621ff5 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Dec 17 23:46:37 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 17 23:46:37 2012 -0800 |
| tree | ac76b054dd2e2c2858f0e179c16b419f44247b89 | |
| parent | 5568a7cef8bee4bb94672226dad83adec9f4d86f [diff] | |
| parent | 970d00347dfc8e66ba11bb5909905d5c63f24121 [diff] |
am 970d0034: (-s ours) 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 '970d00347dfc8e66ba11bb5909905d5c63f24121':