tree 3f16b0d08cd27ba6ba03accab08fd069f9d7f71a
parent aa2f8066c1f1d2b486e49581797bc1b683b376b5
parent 9b9fb5cc08eaa0b66a80eba2f03168531544f65a
author Mike Lockwood <lockwood@android.com> 1309376825 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1309376825 -0700

Merge "GPS: Support for on-demand NTP time injection"