| commit | c8c8c098337905491234b4fc566e609357f7037c | [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 | 929a60cce2bb66440464d95fbf8541945870353f [diff] | |
| parent | 1d45c33763b20a1838371716b58a4ed9239c3667 [diff] |
resolved conflicts for merge of 4e90b0ae to mnc-dev-plus-aosp Change-Id: Iff0f469f09a0ad442db5b593345eaf52c3ca8104