tree c6e0ba23ccc9b648c4084f66d8e5bb422a477630
parent 58b2c43fd50baa0b58dc232733ddb9c9e769fad1
parent c6f34c795540acb8d8c65d8e98256b06728ec13b
author Unsuk Jung <unsuk@google.com> 1418155569 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418155569 +0000

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