| commit | c4fd6394f402f569c0da75a2bfe7a28dc90557fa | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Thu Aug 27 14:24:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:24:12 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 6d406b3b13fae3601497484608782b3dcf7a99f7 [diff] | |
| parent | 31bc159b185a44acedbee78fa12b142ac9e21cf4 [diff] |
am b94b4f1a: am 15db3551: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp * commit 'b94b4f1ad502824f9da8e002055e32992d0f3fa4': resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp