| commit | 593ab9adc361a019afc86afa6646f2efcda9af00 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed May 13 09:25:30 2015 -0700 |
| committer | Kenny Root <kroot@google.com> | Wed May 13 09:25:30 2015 -0700 |
| tree | 157ab5de006efb854cc321a743da7577a939d7f4 | |
| parent | edf14122866d18dbfde71b5178934049cb56bab0 [diff] | |
| parent | 0dcda8464d4f87774fd07aecd1087a31408fbab6 [diff] |
resolved conflicts for merge of b942d6fb to mnc-dev-plus-aosp Change-Id: I6d337d3491b7338173128a1c5cac00dea82bafb3