| commit | efdf629596bcf837b349409959e93050de0538c3 | [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 | eac3b65b3492ca8dabd539c56b392367fbb435e4 | |
| parent | d8a952e126fb37fa05808ced508d5bfaf36cc1f0 [diff] | |
| parent | d0ac74c481a74521406a62e003f9a09885e88d4a [diff] |
resolved conflicts for merge of 486645ee to mnc-dev-plus-aosp Change-Id: I027a4de6e4ebae3bee6b7d2e56bd39c284b8a062