tree a997c04fb16f7200afe86e2b503610eaca72a139
parent b6397817331e6486e31c97335f6866923fd25da1
parent c461578abfd343b96180b679c72a50fa62968377
author Jason Monk <jmonk@google.com> 1466200293 +0000
committer android-build-merger <android-build-merger@google.com> 1466200293 +0000

Merge \\\"QS Edit: Fix auto-selecting add location\\\" into nyc-dev am: dd65ee628f am: e253259000
am: c461578abf

Change-Id: I29eb367316974eb68d83596202811aa79540275c