tree f8f4e0a216d56d6beefc74fd72ca206aba7563c6
parent 6216c4acbbe36b7c14f20ab757948dfe53243211
parent dae3244b9b595f4cd964536b444b379f66205b99
author Michael Kwan <mkwan@google.com> 1441225973 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441225973 +0000

am dae3244b: am d46ad206: am 0b55e179: am 297b9d51: am 0c4dcb93: (-s ours) Merge "Added required features to location mode tests." into lmp-sprout-dev

* commit 'dae3244b9b595f4cd964536b444b379f66205b99':