| commit | 44427179e36f7345286ad3824c94d3130f3c5ca7 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Aug 27 17:58:15 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 27 17:58:15 2015 +0000 |
| tree | 26c988da40785375f5c2fc6d49f129bc0e6a10b2 | |
| parent | d254dc54c15001e3deb8e5bbb402ceb19a091eed [diff] | |
| parent | c9ea793119ed472b19f8fcef1755b5fff3e73d27 [diff] |
resolved conflicts for merge of 71e0dd32 to mnc-dev-plus-aosp automerge: fbeb2aa -s ours automerge: c9ea793 -s ours * commit 'c9ea793119ed472b19f8fcef1755b5fff3e73d27':