| commit | 7c6a2a4ccf30ce74a5acddec406fdf4243da1e50 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Thu Aug 06 11:01:31 2015 -0700 |
| committer | Tao Bao <tbao@google.com> | Thu Aug 06 11:01:31 2015 -0700 |
| tree | bcc46bfc986ef5b36ef5866b440a03417a3cc14d | |
| parent | 479de8779ef74c0976f81cba00492aa17cfb6c36 [diff] | |
| parent | 610520ad206fcb886c6c09f763f434caac8531ff [diff] |
resolved conflicts for merge of 610520ad to mnc-dr-dev-plus-aosp Change-Id: If44e033d2163b1e357be78b5a9e1b6092baf5063