| commit | d9f2167559628781beaa712f7906d61baf41c9b1 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Aug 27 15:42:18 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 27 15:42:18 2015 +0000 |
| tree | ff57db26c2fea8cda4ab9ebbdebcc470485326c5 | |
| parent | cd14a7177b939b3e316f7486d1dfe2c496252c6b [diff] | |
| parent | e53f31e07df108d638259503dfe98d117c028a9b [diff] |
resolved conflicts for merge of a5d549c6 to mnc-dev-plus-aosp automerge: e53f31e -s ours * commit 'e53f31e07df108d638259503dfe98d117c028a9b':