| commit | e0b43a17852081c2fe1c0d2207006e421ffcc74b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 20:07:12 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jul 30 20:07:12 2015 -0700 |
| tree | 13d5f4ab43fcfeeb9ccdf7eb8caba1ffd9f16668 | |
| parent | d2117974e4c22ff6b8967c3b5cd2d497a6ffc856 [diff] | |
| parent | 4e90b0ae59a7b773fba39065494cb41d6853f5be [diff] |
resolved conflicts for merge of 4e90b0ae to mnc-dev-plus-aosp Change-Id: Iff0f469f09a0ad442db5b593345eaf52c3ca8104