| commit | 98841d360524c3049a3b205cb975d937e2619700 | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Wed Aug 12 23:50:05 2015 -0700 |
| committer | Ian Pedowitz <ijpedowitz@google.com> | Wed Aug 12 23:50:05 2015 -0700 |
| tree | 96c8b23b897cb2600db49754545b8d8362399f4b | |
| parent | 8bfa814585944624a101eed4e107e76e94ce2949 [diff] | |
| parent | bb37e84f8d45c34ec86485632e861914ac0473a0 [diff] |
resolved conflicts for merge of bb37e84f to mnc-dev-plus-aosp Change-Id: I90940a50d55395bfd61d5a5e21fac3aa0982ba40