| commit | 4a41f33c5a1be8ab8c64c269d3d5cd298f33c681 | [log] [tgz] |
|---|---|---|
| author | Tom O'Neill <tomo@google.com> | Tue Aug 13 17:37:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 13 17:37:55 2013 -0700 |
| tree | 767b28d3258c4a527b52fde059398fc1ac8fd84a | |
| parent | b8bdd1a0c9cc93d6076dfef7205b4a67ab8693c9 [diff] | |
| parent | 0574c26c36b1b760d80107fb4171cdcb642aabf1 [diff] |
am 0574c26c: am cabe7e82: Merge "Settings app supports location settings injection" into klp-dev * commit '0574c26c36b1b760d80107fb4171cdcb642aabf1': Settings app supports location settings injection