OSDN Git Service

resolved conflicts for merge of e470fd85 to lmp-mr1-ub-dev
authorQuddus Chong <quddusc@google.com>
Thu, 23 Apr 2015 21:29:34 +0000 (14:29 -0700)
committerQuddus Chong <quddusc@google.com>
Thu, 23 Apr 2015 21:30:26 +0000 (14:30 -0700)
commit5dafb34bca889abb8776a320b1ed9544cff9f9b3
tree0949cf27419a9a6a0083c6915a737d001006ead7
parent62eaad7200e172404db587ecec9940670946e92a
parente470fd855c998fd1b6c4913c31f6871053b7f64e
resolved conflicts for merge of e470fd85 to lmp-mr1-ub-dev

Change-Id: I9ecfa4b7b225f2543bdbdad0f046e9474f1cb47f
docs/html/reference/com/google/android/gms/fitness/data/Field.html