| commit | 6bcf9aab6ddedfd9184aec87250ecc41ca381631 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 25 11:16:36 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Aug 25 11:16:36 2015 -0700 |
| tree | 2af6362f66abaa3652dc81058a48f8f6e880ecd9 | |
| parent | 0597d3fbbbe3e898cd6e8c3735a4204f06dd072f [diff] | |
| parent | 4a9d7d8655063a383360f857e67d7c626cf0bc31 [diff] |
resolved conflicts for merge of ba8fc829 to mnc-dev-plus-aosp Change-Id: Ia4daf846df5a86ebca1b6c8d9e41f1633001836f