tree 2b1f9c8afba2b8f47c8fdcbe5323d23332bc5625
parent d48233e1e62c119b4bd67ad66e471f6a21e68a3d
parent fa2992c412c08f76331a3f58ca57cf8cf04e7b84
author Tom O'Neill <tomo@google.com> 1376439496 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1376439738 +0000

Merge "API for location settings injection" into klp-dev