commit 3eb469526461202a12662eef4a360d3eee26969c
author Bertrand Simonnet <bsimonnet@google.com> Wed Oct 07 20:06:23 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 07 20:06:23 2015 +0000
tree 8e1d26497501593388afe34b98132b3727bf7b71
parent 465ec4193d11ee20a2153227cf78a3e0163701f3
parent be95fe971196d0415214ce637469990159e933d0

am a4d9a59a: am 9e45f201: Merge "metricsd: Rename build_target_id to product_id."

* commit 'a4d9a59a0782b666f58063820f643250347c7d0b':
  metricsd: Rename build_target_id to product_id.

metricsd/uploader/proto/system_profile.proto

diff --git a/metricsd/uploader/proto/system_profile.proto b/metricsd/uploader/proto/system_profile.proto
index 4cab0d9..bac828b 100644
--- a/metricsd/uploader/proto/system_profile.proto
+++ b/metricsd/uploader/proto/system_profile.proto
@@ -88,7 +88,7 @@
   optional string application_locale = 4;
 
   message BrilloDeviceData {
-    optional string build_target_id = 1;
+    optional string product_id = 1;
   }
   optional BrilloDeviceData brillo = 21;
 

metricsd/uploader/system_profile_cache.cc

diff --git a/metricsd/uploader/system_profile_cache.cc b/metricsd/uploader/system_profile_cache.cc
index 2437b56..1d87be5 100644
--- a/metricsd/uploader/system_profile_cache.cc
+++ b/metricsd/uploader/system_profile_cache.cc
@@ -136,7 +136,7 @@
   profile_proto->set_channel(profile_.channel);
   metrics::SystemProfileProto_BrilloDeviceData* device_data =
       profile_proto->mutable_brillo();
-  device_data->set_build_target_id(profile_.product_id);
+  device_data->set_product_id(profile_.product_id);
 
   return true;
 }