| commit | 929a60cce2bb66440464d95fbf8541945870353f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 16:33:50 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jul 30 16:33:50 2015 -0700 |
| tree | 2c7a9153480c4423128ec1cfc1ef121d1f28a750 | |
| parent | 8ccbbb05f8dc004a82e1f4b374edac42962aa02d [diff] | |
| parent | 76f00a1e991bd31e40d4941a4142f5f3939f0a75 [diff] |
resolved conflicts for merge of 486645ee to mnc-dev-plus-aosp Change-Id: I027a4de6e4ebae3bee6b7d2e56bd39c284b8a062