tree 69cf75a530390e571ce0b0172e5c394841ed6018
parent 32e17d08629e745cb21ba381f752ec84d2ed591e
parent 78091bf8cabc9f50cc8df14cf5947dc8a906a33d
author TreeHugger Robot <treehugger-gerrit@google.com> 1464135440 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464135440 +0000

Merge "Remove option to configure emergency app" into nyc-dev