| commit | 37d654dac6c5dc99e1f48f0704ced453f3fc83d0 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Jun 02 16:17:54 2015 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Tue Jun 02 16:17:54 2015 -0700 |
| tree | 3d51b7b57dd9032d738562ac263711ed9cd54e03 | |
| parent | 97d11f69d6ab07d8275949fe346287565876451f [diff] | |
| parent | e31788ac6db7ecef909508478b09cc2c95c8ec24 [diff] |
resolved conflicts for merge of 117c3220 to mnc-dev-plus-aosp Change-Id: I6bb3c1e065b51b147fdbc2c3f2e02d8566a06c8f