tree 9e7c70eac85b2e925bf64fae277dcb97ad6d6d4a
parent 3eb9b6adbf58cc301bc920595862dbb8779e045e
parent bcefc92a298c190bb3ff8443a821b6765a112887
author Michael Kwan <mkwan@google.com> 1441226488 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441226488 +0000

am bcefc92a: 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 'bcefc92a298c190bb3ff8443a821b6765a112887':