| commit | 2808bc2faaa1fd42d64bf1b5176d4284bbcefa86 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 25 11:21:58 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Aug 25 11:21:58 2015 -0700 |
| tree | 1461cdac298f3376becd08e4490b9f1174770fb5 | |
| parent | 6bcf9aab6ddedfd9184aec87250ecc41ca381631 [diff] | |
| parent | 08d94ed83ba4e40cfb41317ff846e0bbbf4aeee2 [diff] |
resolved conflicts for merge of 3ecba7f9 to mnc-dev-plus-aosp Change-Id: I46452c03bbda9604f2af2e1edce5d48c6865d436