commit | 17b2afc1f33baf482820cc191ef2a391150dd92c | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Mon Mar 30 18:58:24 2015 -0700 |
committer | Tao Bao <tbao@google.com> | Mon Mar 30 18:59:50 2015 -0700 |
tree | 2dfb0dec13b9285f209d32e7f6d7a1436743c0cc | |
parent | 037444642bc32d8fed3bb996823b6a62faa57195 [diff] | |
parent | 5472176c866b1b1814e4ed9ca340a5c80ee8335a [diff] |
resolved conflicts for merge of 5472176c to master Change-Id: Ib2395d806bb8c029f7743c36cb7849e5589fad7b