tree 795ac5f1bd8cf5597afe2ca44ed39be3dba09cef
parent edda4b4490ad6918db4b1e2a33a7ed22959be432
parent c20407415bca4969e1455d541f6a9fcc63a0569f
author Unsuk Jung <unsuk@google.com> 1441317926 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441317926 +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