tree 203361250f890a60fc9d460536efbc78d897c95c
parent a83125a679f49f6f4bd1b05320c3f00053da057e
parent c20407415bca4969e1455d541f6a9fcc63a0569f
author Unsuk Jung <unsuk@google.com> 1418160848 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418160848 +0000

am c2040741: Merge "Explicitly call out FEATURE_LOCATION_NETWORK as optional" into lmp-sprout-dev

* commit 'c20407415bca4969e1455d541f6a9fcc63a0569f':
  Explicitly call out FEATURE_LOCATION_NETWORK as optional