| commit | 1463840e419feaadbfdf1288005338062f7357f5 | [log] [tgz] |
|---|---|---|
| author | Dake Gu <dake@google.com> | Mon May 04 18:35:13 2015 -0700 |
| committer | Dake Gu <dake@google.com> | Mon May 04 18:35:13 2015 -0700 |
| tree | 4bda5e12a433ce5a2978b785f0fd2848b9c2e3ac | |
| parent | 61ac5487d7617d62ca9ce3b10ea739c53ed3d2c3 [diff] | |
| parent | f00356e69fb61bcfe2e047151cfb0fe4fea0b554 [diff] |
resolved conflicts for merge of f00356e6 to mnc-dev Change-Id: Ie0721f6aa4e7f70932a125d2d12222c2a713c98f